Revert 196544 due to internal bot failures.