Revert my previous commit as it breaks the buildbots
Revert my previous commit as it breaks the buildbots

Swift SVN r32912

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