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

This reverts commit 8b55cc1a5bb6f1020b46586e5efad8a555425483.