Revert "Fix build with GCC 4.8"

This reverts commit 657c607a839927ce5eb73dc6c9eae4432044978c.