Undo the parts of r18941 that depends on LLVM changes.
Undo the parts of r18941 that depends on LLVM changes.

...which I haven't actually committed yet.

Swift SVN r18945

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