revert gcc 4.7 toolchain fixes