Revert "Fix compile error which is specific for GCC 6.2"