Revert r146363 to allow buildbots to make forward progress.