This reverts commit cd2134e4. Seems like this broke some tests on arm and aarch64 boxes. Will investigate before re-landing.