Unbreak gcc-4.6 and cmake builds
Has been broken by ce8265ede245f14e3067f81c9a1dd492d2ac04c3 and 850ceb003f00c55d388751ac4419b77064687a7e