Revert "Add debugging code for a potential leftover bug." This reverts commit afd86f9c8712d9baaec9221e717c9716bb942029. Reason for revert: The added debugging code can also crash. Change-Id: I42ed54f4a19b023610174aca246dd56182983a00