a2cb400daf
this effectively reverts the offending parts of commits d602b087309ca9ddda02f59b1f8d1027881ddbbb and 86612336da04f66dcd7bf0ea951cb28ff32b68a5