Ok, I'll back this out, but I'll send another PR for that. I think this one is ready to be merged now.