this effectively reverts the offending parts of commits d602b08730 and 86612336da
d602b08730
86612336da