Revert some changes until GCC 4.9 is available.