Revert "take 5"

This reverts commit 20b8676914a6c9f86cfb0d6450b2684b2fbde8a4.
Revert "Merge branch 'master' into tweak-probcut-precondition"

This reverts commit b98a6c8f47c1d57686f47e98a8898617233a0103, reversing
changes made to 20b8676914a6c9f86cfb0d6450b2684b2fbde8a4.
Revert "Revert "Merge branch 'master' into tweak-probcut-precondition""

This reverts commit c50f6e26811355dd572861ef7dd83edc888b048a.