Revert r209488; Greg suggests a different approach.