Revert "fix gcc 4.8 compile issue"

This reverts commit d7b8e9ab245df3418fc5cfaa6976b6392f831259.