REAL GCC-4.8+ Fix

Ignore the previous commit and use this one.