Bug 18930: (QA follow-up) Remove debug code