Long story short: I broke all the things
OMG commit all the things