This reverts commit 9d1a61e6. I'd missed some review feedback, and had missed updating an aarch64 test. Reverting while I fix both.