Revert to using c++11 for gcc