Let's just remove the patch stuff, this isn't going to work