Revert "fix build errors with gcc 4.8"

This reverts commit 19670d8a0804f9a00d0e91e72ebba496f9cce18d.