Fix the legacy code for gcc 4.7 as well