Revert r29609 (C++11 fix); it is causing problems.