This reverts commit r194435 and r194434.

Trying to get the bots green.