Patch to 3.0.97 (gregkh)