Remove monkeypatches now that we are using the standard installdir