Bug 953164 - Undo debug code that wasn't part of the review, r=me