Revert "Add temporary debugging assertion, in 9.4 branch only."

This reverts commit 5ee940e1.
Further debugging is needed, but it'll look different than this,
so for simplicity revert this first.