Remove patch that is causing problems with features.