Speculatively revert r109705 since it seems to be causing some build bot