kernel: import follow-up fix for previous backport