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