Revert "gcc 4.8 fix"

This reverts commit 124cf395fc819868b306217727fa733b454ad4c6.
gcc 4.8 fixes