This reverts commit 742e661ba7.
https://gem5-review.googlesource.com/c/public/gem5/+/60551
Change-Id: I4d67abbcea2c828dafe2f591892e23af539cb118
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/60633
Maintainer: Bobby Bruce <bbruce@ucdavis.edu>
Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>