Revert "Hackish workaround for GCC 4.9 not compiling this."

This reverts commit 5115cf7edef42bfd0b0a5e9937c0d5dd4ce05b19.