Revert "Fix kernel gcc7 issue"