Revert "fix gcc 4.8 compile issue"

This reverts commit fe2e7448a063758c8885e38b8d26964b52962c54.