Revert r59464. It was causing this failure: