Revert "fix build with gcc4.8"

This reverts commit 5b13aec68cf00d45f1b8855b9e944dce1344e1a6.