Revert "Temporarily revert r220777 to sort out build bot breakage."

This reverts commit r221028. Later commits depend on this and
reverting just this one causes even more bots to fail.