hm, the bug is upstream now. And your fix turns a supposed-to-be-simpler kmap based patching thing back into something fragile looking again. We might be better off with a revert - or we do a real clean patch.