Revert r194540, it breaks various C++ programs.