Revert "Temporary debug measures"

This reverts commit b2410ff09375fcd5e1c54f94f46cde7e977c2cf0.