kernel: revert r26814