Revert "fix gcc4.7 compile"

This reverts commit bfbbc82c1abcc766ba27f00330c9996393044735.