Remove DI change that should not have gone in
Remove DI change that should not have gone in

This broke some tests, and was not a legitimate cleanup.

Swift SVN r32500

shahmishal/swift,huonw/swift,bitjammer/swift,parkera/swift,kusl/swift,kstaring/swift,slavapestov/swift,hooman/swift,felix91gr/swift,austinzheng/swift,apple/swift,deyton/swift,manavgabhawala/swift,deyton/swift,tkremenek/swift,shajrawi/swift,slavapestov/swift,milseman/swift,frootloops/swift,calebd/swift,airspeedswift/swift,arvedviehweger/swift,atrick/swift,MukeshKumarS/Swift,xwu/swift,hooman/swift,glessard/swift,danielmartin/swift,LeoShimonaka/swift,atrick/swift,swiftix/swift.old,devincoughlin/swift,roambotics/swift,gribozavr/swift,atrick/swift,CodaFi/swift,gottesmm/swift,mightydeveloper/swift,russbishop/swift,kentya6/swift,ben-ng/swift,sdulal/swift,austinzheng/swift,ken0nek/swift,karwa/swift,Ivacker/swift,natecook1000/swift,deyton/swift,gregomni/swift,KrishMunot/swift,xedin/swift,bitjammer/swift,brentdax/swift,devincoughlin/swift,jckarter/swift,jckarter/swift,harlanhaskins/swift,shajrawi/swift,dduan/swift,khizkhiz/swift,JaSpa/swift,kusl/swift,allevato/swift,sschiau/swift,frootloops/swift,kentya6/swift,MukeshKumarS/Swift,huonw/swift,gribozavr/swift,jopamer/swift,tjw/swift,felix91gr/swift,xwu/swift,tjw/swift,djwbrown/swift,bitjammer/swift,JaSpa/swift,return/swift,deyton/swift,LeoShimonaka/swift,karwa/swift,devincoughlin/swift,benlangmuir/swift,manavgabhawala/swift,kusl/swift,natecook1000/swift,johnno1962d/swift,apple/swift,tkremenek/swift,glessard/swift,austinzheng/swift,tkremenek/swift,danielmartin/swift,amraboelela/swift,hooman/swift,kusl/swift,glessard/swift,lorentey/swift,KrishMunot/swift,modocache/swift,JaSpa/swift,swiftix/swift.old,swiftix/swift,jopamer/swift,arvedviehweger/swift,zisko/swift,danielmartin/swift,JGiola/swift,sdulal/swift,mightydeveloper/swift,sschiau/swift,swiftix/swift,codestergit/swift,russbishop/swift,tardieu/swift,jopamer/swift,tardieu/swift,ben-ng/swift,kusl/swift,nathawes/swift,gribozavr/swift,tjw/swift,codestergit/swift,xwu/swift,natecook1000/swift,nathawes/swift,SwiftAndroid/swift,johnno1962d/swift,nathawes/swift,kperryua/swift,allevato/swift,ahoppen/swift,roambotics/swift,roambotics/swift,stephentyrone/swift,JaSpa/swift,zisko/swift,shahmishal/swift,karwa/swift,frootloops/swift,KrishMunot/swift,tjw/swift,tkremenek/swift,gottesmm/swift,tkremenek/swift,tinysun212/swift-windows,kperryua/swift,kentya6/swift,lorentey/swift,alblue/swift,swiftix/swift.old,kstaring/swift,arvedviehweger/swift,johnno1962d/swift,natecook1000/swift,danielmartin/swift,airspeedswift/swift,LeoShimonaka/swift,benlangmuir/swift,atrick/swift,sschiau/swift,kperryua/swift,xedin/swift,jmgc/swift,calebd/swift,parkera/swift,brentdax/swift,rudkx/swift,gottesmm/swift,therealbnut/swift,shajrawi/swift,swiftix/swift,nathawes/swift,alblue/swift,jckarter/swift,rudkx/swift,practicalswift/swift,khizkhiz/swift,therealbnut/swift,felix91gr/swift,manavgabhawala/swift,sschiau/swift,djwbrown/swift,uasys/swift,manavgabhawala/swift,gmilos/swift,jckarter/swift,brentdax/swift,arvedviehweger/swift,devincoughlin/swift,uasys/swift,devincoughlin/swift,natecook1000/swift,adrfer/swift,slavapestov/swift,shajrawi/swift,zisko/swift,adrfer/swift,cbrentharris/swift,milseman/swift,SwiftAndroid/swift,jmgc/swift,codestergit/swift,shajrawi/swift,parkera/swift,kentya6/swift,djwbrown/swift,kperryua/swift,JGiola/swift,ken0nek/swift,swiftix/swift,harlanhaskins/swift,jckarter/swift,OscarSwanros/swift,adrfer/swift,uasys/swift,Ivacker/swift,CodaFi/swift,therealbnut/swift,shajrawi/swift,khizkhiz/swift,zisko/swift,bitjammer/swift,roambotics/swift,practicalswift/swift,hooman/swift,stephentyrone/swift,modocache/swift,cbrentharris/swift,kusl/swift,cbrentharris/swift,aschwaighofer/swift,swiftix/swift,Jnosh/swift,tinysun212/swift-windows,allevato/swift,khizkhiz/swift,amraboelela/swift,benlangmuir/swift,SwiftAndroid/swift,Jnosh/swift,karwa/swift,kstaring/swift,xedin/swift,ahoppen/swift,roambotics/swift,frootloops/swift,hughbe/swift,aschwaighofer/swift,swiftix/swift.old,devincoughlin/swift,shajrawi/swift,frootloops/swift,huonw/swift,JaSpa/swift,roambotics/swift,ken0nek/swift,calebd/swift,return/swift,xedin/swift,codestergit/swift,CodaFi/swift,IngmarStein/swift,rudkx/swift,felix91gr/swift,practicalswift/swift,bitjammer/swift,return/swift,austinzheng/swift,jopamer/swift,IngmarStein/swift,CodaFi/swift,sdulal/swift,lorentey/swift,emilstahl/swift,apple/swift,tardieu/swift,ahoppen/swift,gribozavr/swift,LeoShimonaka/swift,LeoShimonaka/swift,austinzheng/swift,MukeshKumarS/Swift,modocache/swift,codestergit/swift,hughbe/swift,jtbandes/swift,OscarSwanros/swift,gregomni/swift,dduan/swift,practicalswift/swift,Ivacker/swift,IngmarStein/swift,ahoppen/swift,CodaFi/swift,gottesmm/swift,swiftix/swift,khizkhiz/swift,xwu/swift,therealbnut/swift,tardieu/swift,jopamer/swift,jtbandes/swift,stephentyrone/swift,aschwaighofer/swift,milseman/swift,russbishop/swift,modocache/swift,sschiau/swift,devincoughlin/swift,dduan/swift,rudkx/swift,zisko/swift,danielmartin/swift,return/swift,modocache/swift,cbrentharris/swift,therealbnut/swift,benlangmuir/swift,SwiftAndroid/swift,arvedviehweger/swift,dreamsxin/swift,brentdax/swift,tkremenek/swift,lorentey/swift,kstaring/swift,stephentyrone/swift,harlanhaskins/swift,brentdax/swift,russbishop/swift,JGiola/swift,OscarSwanros/swift,dduan/swift,xedin/swift,ahoppen/swift,MukeshKumarS/Swift,gregomni/swift,sdulal/swift,uasys/swift,JGiola/swift,emilstahl/swift,Jnosh/swift,tardieu/swift,dduan/swift,calebd/swift,benlangmuir/swift,gribozavr/swift,cbrentharris/swift,tinysun212/swift-windows,cbrentharris/swift,emilstahl/swift,karwa/swift,xedin/swift,swiftix/swift.old,kentya6/swift,shahmishal/swift,parkera/swift,OscarSwanros/swift,Jnosh/swift,JaSpa/swift,khizkhiz/swift,russbishop/swift,sdulal/swift,alblue/swift,felix91gr/swift,sschiau/swift,harlanhaskins/swift,airspeedswift/swift,amraboelela/swift,frootloops/swift,shahmishal/swift,ahoppen/swift,airspeedswift/swift,aschwaighofer/swift,allevato/swift,Ivacker/swift,arvedviehweger/swift,emilstahl/swift,nathawes/swift,russbishop/swift,lorentey/swift,huonw/swift,shahmishal/swift,uasys/swift,gmilos/swift,jmgc/swift,zisko/swift,karwa/swift,uasys/swift,stephentyrone/swift,huonw/swift,modocache/swift,MukeshKumarS/Swift,lorentey/swift,alblue/swift,gmilos/swift,johnno1962d/swift,kusl/swift,return/swift,tjw/swift,OscarSwanros/swift,danielmartin/swift,Ivacker/swift,ken0nek/swift,shahmishal/swift,IngmarStein/swift,austinzheng/swift,kperryua/swift,deyton/swift,milseman/swift,devincoughlin/swift,mightydeveloper/swift,apple/swift,CodaFi/swift,return/swift,jtbandes/swift,felix91gr/swift,nathawes/swift,LeoShimonaka/swift,alblue/swift,jckarter/swift,SwiftAndroid/swift,KrishMunot/swift,gregomni/swift,jtbandes/swift,gmilos/swift,gribozavr/swift,hughbe/swift,ben-ng/swift,sdulal/swift,dduan/swift,sdulal/swift,karwa/swift,brentdax/swift,johnno1962d/swift,glessard/swift,Ivacker/swift,tinysun212/swift-windows,huonw/swift,benlangmuir/swift,alblue/swift,bitjammer/swift,allevato/swift,felix91gr/swift,manavgabhawala/swift,OscarSwanros/swift,jmgc/swift,slavapestov/swift,gmilos/swift,amraboelela/swift,brentdax/swift,sschiau/swift,hughbe/swift,tjw/swift,kusl/swift,gottesmm/swift,nathawes/swift,jtbandes/swift,airspeedswift/swift,kentya6/swift,apple/swift,austinzheng/swift,swiftix/swift.old,practicalswift/swift,gribozavr/swift,emilstahl/swift,allevato/swift,KrishMunot/swift,codestergit/swift,hooman/swift,modocache/swift,practicalswift/swift,kstaring/swift,hughbe/swift,KrishMunot/swift,djwbrown/swift,deyton/swift,djwbrown/swift,atrick/swift,parkera/swift,ben-ng/swift,hooman/swift,milseman/swift,swiftix/swift.old,johnno1962d/swift,khizkhiz/swift,allevato/swift,IngmarStein/swift,airspeedswift/swift,Jnosh/swift,gottesmm/swift,tardieu/swift,shajrawi/swift,parkera/swift,tkremenek/swift,swiftix/swift.old,djwbrown/swift,jckarter/swift,mightydeveloper/swift,adrfer/swift,djwbrown/swift,harlanhaskins/swift,gregomni/swift,apple/swift,slavapestov/swift,hughbe/swift,codestergit/swift,glessard/swift,practicalswift/swift,mightydeveloper/swift,shahmishal/swift,danielmartin/swift,CodaFi/swift,amraboelela/swift,manavgabhawala/swift,stephentyrone/swift,aschwaighofer/swift,milseman/swift,practicalswift/swift,ben-ng/swift,Ivacker/swift,mightydeveloper/swift,tinysun212/swift-windows,adrfer/swift,xwu/swift,bitjammer/swift,Ivacker/swift,tjw/swift,harlanhaskins/swift,slavapestov/swift,cbrentharris/swift,uasys/swift,stephentyrone/swift,jtbandes/swift,amraboelela/swift,jmgc/swift,lorentey/swift,shahmishal/swift,therealbnut/swift,MukeshKumarS/Swift,aschwaighofer/swift,gmilos/swift,emilstahl/swift,OscarSwanros/swift,Jnosh/swift,jmgc/swift,parkera/swift,frootloops/swift,deyton/swift,huonw/swift,zisko/swift,emilstahl/swift,dduan/swift,kstaring/swift,sdulal/swift,gmilos/swift,calebd/swift,rudkx/swift,atrick/swift,KrishMunot/swift,ken0nek/swift,JGiola/swift,kentya6/swift,gottesmm/swift,xedin/swift,aschwaighofer/swift,gregomni/swift,IngmarStein/swift,johnno1962d/swift,therealbnut/swift,tinysun212/swift-windows,natecook1000/swift,LeoShimonaka/swift,hughbe/swift,SwiftAndroid/swift,karwa/swift,hooman/swift,return/swift,slavapestov/swift,mightydeveloper/swift,manavgabhawala/swift,tinysun212/swift-windows,russbishop/swift,ken0nek/swift,gribozavr/swift,dreamsxin/swift,jmgc/swift,MukeshKumarS/Swift,cbrentharris/swift,parkera/swift,arvedviehweger/swift,ken0nek/swift,kperryua/swift,mightydeveloper/swift,JaSpa/swift,sschiau/swift,LeoShimonaka/swift,amraboelela/swift,xedin/swift,kentya6/swift,milseman/swift,SwiftAndroid/swift,kperryua/swift,adrfer/swift,calebd/swift,xwu/swift,emilstahl/swift,jopamer/swift,natecook1000/swift,swiftix/swift,ben-ng/swift,Jnosh/swift,xwu/swift,calebd/swift,IngmarStein/swift,jtbandes/swift,ben-ng/swift,rudkx/swift,alblue/swift,lorentey/swift,tardieu/swift,glessard/swift,kstaring/swift,jopamer/swift,JGiola/swift,airspeedswift/swift,harlanhaskins/swift,adrfer/swift