Remove conflicting patch
Remove conflicting RPi patch