This reverts commit daa73b63d5dc5eb264341336c0d7cd64d750664d.
The fix has already been imported by
commit b7735d8113 ("kernel: import follow-up fix for previous backport").
The patch won't apply twice.
Signed-off-by: Daniel Golle <daniel@makrotopia.org>