Underlying bug has been fixed, extra debug code no longer needed. This reverts commit ccf851f1. Change-Id: I19ad9239efdf1d8f70cd74af9b7c2ae97713208f