Revert "fix build errors using gcc-4.7"

This reverts commit 28410c8d69017a50bfb3c1907fa2e35b7d318848.