I am an idiot.

THis should get rebased into the previous commit if we decide to pull this in.