Revert 5541756..d7d5d59

This rolls back to commit 55417564c7598da45e25216ecee51828df480e74.
Eliminated some React state lower down