Partially revert commit 026429bcab0dff5f6a81f0454d65af0f43f1b258

This was breaking building with GCC 4.9