Revert "less ambitious debugging"

This reverts commit b2b563274db101cdf077236de56d257651182319.
Revert "even more debugging"

This reverts commit 9ef0cd038388d6610433420f8090e6b2f45981a2.