Change back to before C++11, for now. This might be required for compiling on pre-C++11 platforms.