Revert "Proper gcc 4.8 fix"

This reverts commit 7a0d846bced0fb28116c9c3d756027a741b574dc.