This reverts commit ac7d7a7d7a.
https://gem5-review.googlesource.com/c/public/gem5/+/60550
Change-Id: Ib971a602057856204a385bd95e5ad61125167eac
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/60634
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>