Remove temporary Gambit patches