Also revert 108422, it's causing some test failures.