[master-next] Undo temporary change to fix merge conflict
[master-next] Undo temporary change to fix merge conflict

Reverts 0cf3cfabbb

jckarter/swift,rudkx/swift,airspeedswift/swift,tkremenek/swift,aschwaighofer/swift,CodaFi/swift,ahoppen/swift,ahoppen/swift,atrick/swift,harlanhaskins/swift,nathawes/swift,hooman/swift,allevato/swift,apple/swift,benlangmuir/swift,allevato/swift,CodaFi/swift,JGiola/swift,allevato/swift,rudkx/swift,xwu/swift,glessard/swift,apple/swift,jmgc/swift,gregomni/swift,xwu/swift,hooman/swift,benlangmuir/swift,parkera/swift,rudkx/swift,gregomni/swift,JGiola/swift,hooman/swift,hooman/swift,jckarter/swift,jckarter/swift,allevato/swift,glessard/swift,apple/swift,xwu/swift,jmgc/swift,benlangmuir/swift,benlangmuir/swift,aschwaighofer/swift,parkera/swift,airspeedswift/swift,nathawes/swift,harlanhaskins/swift,roambotics/swift,rudkx/swift,atrick/swift,nathawes/swift,jckarter/swift,xwu/swift,parkera/swift,xwu/swift,allevato/swift,benlangmuir/swift,parkera/swift,jmgc/swift,airspeedswift/swift,roambotics/swift,gregomni/swift,JGiola/swift,glessard/swift,glessard/swift,nathawes/swift,apple/swift,tkremenek/swift,atrick/swift,airspeedswift/swift,jmgc/swift,JGiola/swift,CodaFi/swift,glessard/swift,tkremenek/swift,airspeedswift/swift,atrick/swift,tkremenek/swift,gregomni/swift,hooman/swift,parkera/swift,hooman/swift,aschwaighofer/swift,tkremenek/swift,stephentyrone/swift,stephentyrone/swift,CodaFi/swift,JGiola/swift,ahoppen/swift,harlanhaskins/swift,xwu/swift,nathawes/swift,stephentyrone/swift,harlanhaskins/swift,CodaFi/swift,apple/swift,aschwaighofer/swift,glessard/swift,apple/swift,CodaFi/swift,stephentyrone/swift,JGiola/swift,aschwaighofer/swift,stephentyrone/swift,roambotics/swift,jckarter/swift,gregomni/swift,nathawes/swift,ahoppen/swift,gregomni/swift,rudkx/swift,CodaFi/swift,roambotics/swift,jmgc/swift,roambotics/swift,aschwaighofer/swift,parkera/swift,hooman/swift,ahoppen/swift,harlanhaskins/swift,stephentyrone/swift,allevato/swift,atrick/swift,harlanhaskins/swift,allevato/swift,parkera/swift,jmgc/swift,jckarter/swift,airspeedswift/swift,stephentyrone/swift,harlanhaskins/swift,nathawes/swift,xwu/swift,tkremenek/swift,rudkx/swift,atrick/swift,jmgc/swift,roambotics/swift,jckarter/swift,parkera/swift,aschwaighofer/swift,ahoppen/swift,tkremenek/swift,airspeedswift/swift,benlangmuir/swift