Revert "Add more debug information."

This reverts commit 8693bc7abd39f9dcd4b73bdd43054de450a45a03.

Change-Id: I7e6df6c155d9a7544c860b21bcb31c4e04d122e7
7 files changed