Revert partially GCC-4.8+ Build Fix