Revert "gcc4.7 fixes"

This reverts commit 971d3c7814e64d00879df6608fc67244d7ba1eb3.