Ok, so after messing this up a couple different ways I found a way to fix this that doesn't break us going to 1.2.0. This is suboptimal, but it's a start. I'll clean up the rest for 2.0.0.