Revert 85ba268..70c4430

This rolls back to commit 85ba268173c0feaa4e79cb925c3d596d1213dc05.
Trying to fix my fuck-up . . .