Revert 3a875625b due to GCC 4.8.1 apparently breaking under it.