[svn r42193] revert my changes
[svn r42193] revert my changes

--HG--
branch : trunk

mbirtwell/pytest,pytest-dev/pytest,Bachmann1234/pytest,ojake/pytest,RonnyPfannschmidt/pytest,jb098/pytest,takluyver/pytest,vodik/pytest,pelme/pytest,bukzor/pytest,ionelmc/pytest,mbirtwell/pytest,Carreau/pytest,lukas-bednar/pytest,tomviner/pytest,userzimmermann/pytest,ropez/pytest,ddboline/pytest,inirudebwoy/pytest,Magicjarvis/py,markshao/pytest,omarkohl/pytest,vmalloc/dessert,hpk42/pytest,nicoddemus/pytest,The-Compiler/pytest,eli-b/pytest,hunse/pytest,icemac/pytest,ghostsquad/pytest,pelme/pytest,davidszotten/pytest,oleg-alexandrov/pytest,ionelmc/pytest,MengJueM/pytest,wfxiang08/pytest,hackebrot/pytest,JonathonSonesen/pytest,bubenkoff/pytest,vodik/pytest,chiller/pytest,alfredodeza/pytest,chiller/pytest,Akasurde/pytest,etataurov/pytest,abusalimov/pytest,ojake/pytest,ghostsquad/pytest,mdboom/pytest,Bjwebb/pytest,ericdill/pytest,The-Compiler/pytest,doordash/pytest,codewarrior0/pytest,mhils/pytest,rmfitzpatrick/pytest,ericdill/pytest,lukas-bednar/pytest,skylarjhdownes/pytest,doordash/pytest,wfxiang08/pytest,ropez/pytest,tgoodlet/pytest,hunse/pytest,MichaelAquilina/pytest,pytest-dev/py,tareqalayan/pytest,bukzor/pytest,flub/pytest,txomon/pytest,Carreau/pytest,Haibo-Wang-ORG/pytest,nicoddemus/repo-test,inirudebwoy/pytest,mdboom/pytest,rouge8/pytest,untitaker/pytest,chillbear/pytest,rouge8/pytest,abusalimov/pytest,nicoddemus/repo-test,Bachmann1234/pytest,bubenkoff/pytest,Bjwebb/pytest,untitaker/pytest,gabrielcnr/pytest,Haibo-Wang-ORG/pytest,jb098/pytest,oleg-alexandrov/pytest,tomviner/pytest,MengJueM/pytest,codewarrior0/pytest,nicoddemus/pytest,hpk42/pytest,takluyver/pytest,omarkohl/pytest,mhils/pytest,jaraco/pytest,JonathonSonesen/pytest,malinoff/pytest,userzimmermann/pytest,chillbear/pytest,gabrielcnr/pytest,icemac/pytest,pfctdayelise/pytest