Revert "fix up post-commit more"

This reverts commit f46e4e2998849777139b3039b2c5bffe3c1904b9.
Revert "fix saving failed gitshots"

This reverts commit 23874e809356d7a934700662f3defc6d562b5f50.
Revert "fix up"

This reverts commit db6c94a6ee5f8aecc9ce054ed7edcd5d9bfc207f.
Revert "crazy crazy crazy reorg"

This reverts commit b71f113e88ddc40d6827b92c619b251a5711abe3.