Revert the gcc4.8.1 commits for the moment