Revert r200431 due to bot failures.