Let's try this

I'm pretty positive that this commit by CM is what is breaking my build. We'll find out shortly