revert part of c33b198 to fix build of ninja_test
revert part of c33b198 to fix build of ninja_test

ilor/ninja,jsternberg/ninja,PetrWolf/ninja-main,autopulated/ninja,tfarina/ninja,nafest/ninja,purcell/ninja,bmeurer/ninja,dendy/ninja,jimon/ninja,bmeurer/ninja,dabrahams/ninja,Maratyszcza/ninja-pypi,mathstuf/ninja,syntheticpp/ninja,glensc/ninja,chenyukang/ninja,lizh06/ninja,ctiller/ninja,nico/ninja,glensc/ninja,iwadon/ninja,mutac/ninja,curinir/ninja,autopulated/ninja,ninja-build/ninja,jendrikillner/ninja,yannicklm/ninja,sorbits/ninja,ikarienator/ninja,jhanssen/ninja,mydongistiny/ninja,yannicklm/ninja,pck/ninja,ndsol/subninja,mohamed/ninja,hnney/ninja,PetrWolf/ninja-main,sgraham/ninja,ukai/ninja,martine/ninja,pck/ninja,kimgr/ninja,maruel/ninja,dpwright/ninja,maximuska/ninja,nornagon/ninja,bmeurer/ninja,jimon/ninja,Ju2ender/ninja,jsternberg/ninja,martine/ninja,PetrWolf/ninja,ilor/ninja,nickhutchinson/ninja,autopulated/ninja,mutac/ninja,maximuska/ninja,metti/ninja,rjogrady/ninja,sxlin/dist_ninja,barak/ninja,Maratyszcza/ninja-pypi,atetubou/ninja,jhanssen/ninja,mutac/ninja,atetubou/ninja,ctiller/ninja,okuoku/ninja,ninja-build/ninja,Qix-/ninja,liukd/ninja,ThiagoGarciaAlves/ninja,vvvrrooomm/ninja,jendrikillner/ninja,chenyukang/ninja,vvvrrooomm/ninja,tfarina/ninja,yannicklm/ninja,nico/ninja,tychoish/ninja,purcell/ninja,martine/ninja,iwadon/ninja,mdempsky/ninja,drbo/ninja,pathscale/ninja,tfarina/ninja,fuchsia-mirror/third_party-ninja,rnk/ninja,synaptek/ninja,metti/ninja,nornagon/ninja,ilor/ninja,automeka/ninja,fifoforlifo/ninja,fifoforlifo/ninja,pck/ninja,sorbits/ninja,lizh06/ninja,sxlin/dist_ninja,kimgr/ninja,kissthink/ninja,LuaDist/ninja,sgraham/ninja,sxlin/dist_ninja,jendrikillner/ninja,ukai/ninja,nocnokneo/ninja,purcell/ninja,metti/ninja,juntalis/ninja,fifoforlifo/ninja,yannicklm/ninja,ndsol/subninja,drbo/ninja,dorgonman/ninja,ignatenkobrain/ninja,rnk/ninja,mathstuf/ninja,nico/ninja,nornagon/ninja,kissthink/ninja,colincross/ninja,maruel/ninja,mutac/ninja,sxlin/dist_ninja,moroten/ninja,SByer/ninja,juntalis/ninja,dorgonman/ninja,ThiagoGarciaAlves/ninja,ehird/ninja,hnney/ninja,rjogrady/ninja,Qix-/ninja,bradking/ninja,jhanssen/ninja,nornagon/ninja,ukai/ninja,hnney/ninja,mydongistiny/ninja,dpwright/ninja,moroten/ninja,iwadon/ninja,rnk/ninja,mathstuf/ninja,kimgr/ninja,curinir/ninja,AoD314/ninja,purcell/ninja,dabrahams/ninja,mgaunard/ninja,mgaunard/ninja,maximuska/ninja,ignatenkobrain/ninja,fuchsia-mirror/third_party-ninja,sorbits/ninja,tychoish/ninja,ukai/ninja,AoD314/ninja,AoD314/ninja,nocnokneo/ninja,synaptek/ninja,kissthink/ninja,rnk/ninja,pathscale/ninja,nickhutchinson/ninja,liukd/ninja,bradking/ninja,guiquanz/ninja,vvvrrooomm/ninja,mdempsky/ninja,mathstuf/ninja,ignatenkobrain/ninja,sgraham/ninja,moroten/ninja,AoD314/ninja,guiquanz/ninja,synaptek/ninja,glensc/ninja,Maratyszcza/ninja-pypi,mohamed/ninja,drbo/ninja,pathscale/ninja,nico/ninja,mgaunard/ninja,syntheticpp/ninja,tychoish/ninja,iwadon/ninja,pathscale/ninja,juntalis/ninja,barak/ninja,rjogrady/ninja,sxlin/dist_ninja,mdempsky/ninja,nafest/ninja,tfarina/ninja,LuaDist/ninja,nicolasdespres/ninja,nafest/ninja,ndsol/subninja,tychoish/ninja,okuoku/ninja,okuoku/ninja,kissthink/ninja,dpwright/ninja,lizh06/ninja,lizh06/ninja,liukd/ninja,LuaDist/ninja,autopulated/ninja,syntheticpp/ninja,atetubou/ninja,liukd/ninja,ctiller/ninja,TheOneRing/ninja,barak/ninja,colincross/ninja,SByer/ninja,martine/ninja,nafest/ninja,TheOneRing/ninja,Ju2ender/ninja,Maratyszcza/ninja-pypi,jimon/ninja,Qix-/ninja,automeka/ninja,mgaunard/ninja,nicolasdespres/ninja,nickhutchinson/ninja,ikarienator/ninja,colincross/ninja,fifoforlifo/ninja,mdempsky/ninja,guiquanz/ninja,glensc/ninja,jsternberg/ninja,vvvrrooomm/ninja,rjogrady/ninja,mydongistiny/ninja,ninja-build/ninja,maruel/ninja,chenyukang/ninja,sorbits/ninja,SByer/ninja,ikarienator/ninja,dorgonman/ninja,juntalis/ninja,PetrWolf/ninja,TheOneRing/ninja,TheOneRing/ninja,jimon/ninja,dabrahams/ninja,dendy/ninja,sxlin/dist_ninja,ctiller/ninja,nocnokneo/ninja,ThiagoGarciaAlves/ninja,dabrahams/ninja,nickhutchinson/ninja,sxlin/dist_ninja,atetubou/ninja,pck/ninja,ThiagoGarciaAlves/ninja,PetrWolf/ninja,maruel/ninja,sgraham/ninja,PetrWolf/ninja-main,dendy/ninja,PetrWolf/ninja,barak/ninja,mohamed/ninja,colincross/ninja,ndsol/subninja,mohamed/ninja,jsternberg/ninja,ignatenkobrain/ninja,kimgr/ninja,hnney/ninja,ehird/ninja,LuaDist/ninja,bmeurer/ninja,drbo/ninja,jendrikillner/ninja,curinir/ninja,SByer/ninja,nocnokneo/ninja,Ju2ender/ninja,jhanssen/ninja,fuchsia-mirror/third_party-ninja,Ju2ender/ninja,dorgonman/ninja,nicolasdespres/ninja,curinir/ninja,metti/ninja,okuoku/ninja,mydongistiny/ninja,ehird/ninja,automeka/ninja,bradking/ninja,synaptek/ninja,fuchsia-mirror/third_party-ninja,ikarienator/ninja,Qix-/ninja,ilor/ninja,guiquanz/ninja,automeka/ninja,dendy/ninja,ehird/ninja,syntheticpp/ninja,PetrWolf/ninja-main,ninja-build/ninja,nicolasdespres/ninja,chenyukang/ninja,dpwright/ninja,bradking/ninja,moroten/ninja,maximuska/ninja