Simplified patch for kernel 3.1