Revert "Temporary debugging"

This reverts commit c170e20c6f8ff40876887f3d74e2caec0caef6f5.

Change-Id: I251b6e108b386559605973ca0ef21d805ffe00a3
2 files changed