Revert "Update for 1.8"

This reverts commit c5259b6d78e19983dc9278c76025da1479dbed36.
Revert "Stop printing debug info"

This reverts commit 6a5448fdbb3754e246c6c88520819e9f476e1a5b.