Revert "gcc 4.8 fixes"

This reverts commit 32eb97adff068d64cd914ba234790696032608d9.