Revert r194125 and r194186: We're going to fix this a different way.