Reverting back to adding C++-11 flag