Revert C++11ification in r203534 and r203536. Apparently our toolchains aren't
ready for this yet.