Remaining revert of 47207292792315ab22070be3f2952ceb3f2ef81a now that RTD builds 3.5
Remaining revert of 47207292792315ab22070be3f2952ceb3f2ef81a now that RTD builds 3.5

numberoverzero/bloop,numberoverzero/bloop