Revert "Fix for GCC 4.8"

This reverts commit e8eed0b5592f661431cb71d1f4d6c26def1a01bd.