Revert "Fix build with GCC 4.8"

This reverts commit 360c8ea9d3491a1d88b64c418f84d1da0bb8df66.