Un-fuck our version control