Yep, I wasted a whole commit on this.