Revert a745825..c8535c2

This rolls back to commit a745825df8d808b1d382efd3f38bd26cb2abef76.
Squashed?

I’m a noob, doing my best. Sorry.