Revert "Merge branch 'debuggingTastes'"

This reverts commit 95f1e679224bd1115c45f4adbf15067aa0e5888a, reversing
changes made to 40e829498b910eb43c292b19a15e7b6e9ea28988.