Revert r196639 while I investigate a bot failure.