Rollback debug changes from pull #167