Revert r194663 and r194647.

Per feedback from Jordan Rose I realized this wasn't the right way to go.