Remove patch and fix kernel