Revert "gcc 4.9 workaround"

This reverts commit 706f4a71fbc128de1dd2326d10f6447ac3f0b3ec.