Revert r373755. It did not work because glm 0.9.6.0 removed support for
pre-C++11 compiler AND library. math/glm was reverted to 0.9.5.4 for now.