Lots of reverts. This is a good state.

This reverts commit 36b0172e83ad01d05294f3ad43a3b1211a2936bc.
This reverts commit 4bc7e72e5a461fd4730c52f7f30a74159cef3fa6.
This reverts commit 78091aeabc5c8ee2ef8fa20dd9edda2d14636dfe.
This reverts commit d8eefa57f9f9aaaf55c4c9cc881f115fe037b417.
This reverts commit e6fae4fbe1f30f5a64496b407ca04126960c6a43.
This reverts commit 32fceb222ee0f6d0754a3a69b47c78e9d53fbae7.
This reverts commit 04c5dd8d04137918b71a6f9cd15e74f159cebade.
This reverts commit ca7bf5991a0ec4c5477e7220dd2a14e02b35ea1d.