Revert "gcc 4.8 fixes"

This reverts commit 6ada0ddfb3171b86de79f96e790b27e070c54d84.
gcc 4.8 fixes