Really fix gcc4 build.

Here I come to save the day!!