Fix for CM10 (using older patches like before)

Something is wrong, either my tree is hopelessly borked, or there is a
hidden error in the patches. Investigation is needed. But this looks fine.