- Revert some changes from 85044, 85045, and 85047 that broke x86_64 tests and