Get rid of C++11