Revert c++11

Temporarily, until OS X builds can be got working again.