Revert r117876 for now, it's causing more testsuite failures.