Revert past three bullshit commits. I moved them into their own bullshit branch.