ran    git revert --no-commit 6317cf84aaeb27b1db6414c6ac396f0fb0da03e7..96d2ae9a43918457fd73ddcdc3dbcc626bcee23a    .  so we should now be in 6317cf84aaeb27b1db6414c6ac396f0fb0da03e7