Suppress GCC 4.9.1 warnings
Revert "Suppress GCC 4.9.1 warnings"

This reverts commit 289b2d7ec4f0e06fe5fc85a8b11eafe536331e04.
Amend fix for suppressing GCC warnings