Broken version being committed, so will can commit his broken version so we can both finish our hacking without dealing with repo conflicts.