Revert "Patches to aid in debugging."

This reverts commit 1acfce306f19b966bc7caeb5fac60ca56a24921e.