Patch to 3.0.96 (gregkh)