Bringing back support for GCC 4.7