Remove 1 fix now that upstream master donates methods from modules