Revert "Slightly altered debugging code"

This reverts commit 477d7c30ae2a6f3140379bbd1386d2ac9117ac6e.