Revert "gcc 4.8 fixes"

This reverts commit 8507197bf161077985a9b348a8c0b8e3a4d32b31.