Rolling back a couple changes and spawning a branch from here.