Decided to drop my changes, start from scratch with their base version

Fuck this.