Revert "Debugging changes, to be undone..."

This reverts commit 71261482d90900e1c9061561bbc6ef77af8e0a6c.