reverted changes from gh-8566
reverted changes from gh-8566

person142/scipy,e-q/scipy,rgommers/scipy,pizzathief/scipy,ilayn/scipy,zerothi/scipy,rgommers/scipy,vigna/scipy,lhilt/scipy,andyfaff/scipy,aarchiba/scipy,jor-/scipy,vigna/scipy,ilayn/scipy,aeklant/scipy,Eric89GXL/scipy,gfyoung/scipy,matthew-brett/scipy,pizzathief/scipy,grlee77/scipy,grlee77/scipy,vigna/scipy,perimosocordiae/scipy,mdhaber/scipy,perimosocordiae/scipy,zerothi/scipy,pizzathief/scipy,jor-/scipy,matthew-brett/scipy,ilayn/scipy,aarchiba/scipy,Stefan-Endres/scipy,arokem/scipy,lhilt/scipy,gfyoung/scipy,Stefan-Endres/scipy,Stefan-Endres/scipy,jamestwebber/scipy,zerothi/scipy,WarrenWeckesser/scipy,perimosocordiae/scipy,rgommers/scipy,nmayorov/scipy,scipy/scipy,scipy/scipy,gfyoung/scipy,scipy/scipy,Stefan-Endres/scipy,scipy/scipy,person142/scipy,Eric89GXL/scipy,andyfaff/scipy,matthew-brett/scipy,e-q/scipy,Stefan-Endres/scipy,zerothi/scipy,Eric89GXL/scipy,anntzer/scipy,WarrenWeckesser/scipy,arokem/scipy,lhilt/scipy,WarrenWeckesser/scipy,pizzathief/scipy,vigna/scipy,perimosocordiae/scipy,WarrenWeckesser/scipy,Eric89GXL/scipy,scipy/scipy,lhilt/scipy,aeklant/scipy,pizzathief/scipy,jor-/scipy,gertingold/scipy,jamestwebber/scipy,matthew-brett/scipy,endolith/scipy,mdhaber/scipy,anntzer/scipy,tylerjereddy/scipy,gertingold/scipy,andyfaff/scipy,arokem/scipy,aarchiba/scipy,aeklant/scipy,Stefan-Endres/scipy,grlee77/scipy,perimosocordiae/scipy,andyfaff/scipy,zerothi/scipy,jamestwebber/scipy,zerothi/scipy,arokem/scipy,endolith/scipy,gfyoung/scipy,Eric89GXL/scipy,anntzer/scipy,endolith/scipy,jor-/scipy,person142/scipy,tylerjereddy/scipy,mdhaber/scipy,aeklant/scipy,endolith/scipy,endolith/scipy,nmayorov/scipy,e-q/scipy,nmayorov/scipy,nmayorov/scipy,aarchiba/scipy,anntzer/scipy,person142/scipy,aeklant/scipy,anntzer/scipy,lhilt/scipy,mdhaber/scipy,gertingold/scipy,e-q/scipy,WarrenWeckesser/scipy,gfyoung/scipy,jor-/scipy,e-q/scipy,perimosocordiae/scipy,rgommers/scipy,nmayorov/scipy,ilayn/scipy,andyfaff/scipy,andyfaff/scipy,anntzer/scipy,rgommers/scipy,scipy/scipy,ilayn/scipy,jamestwebber/scipy,mdhaber/scipy,WarrenWeckesser/scipy,tylerjereddy/scipy,person142/scipy,endolith/scipy,aarchiba/scipy,ilayn/scipy,mdhaber/scipy,tylerjereddy/scipy,grlee77/scipy,grlee77/scipy,gertingold/scipy,vigna/scipy,gertingold/scipy,Eric89GXL/scipy,jamestwebber/scipy,arokem/scipy,tylerjereddy/scipy,matthew-brett/scipy