Rollback debug changes from pull #167
Merge pull request #169 from karma-exchange-org/rollback_debug_changes_from_pull_167

Rollback debug changes from pull #167