Removed several patches (accepted upstream).