Bug 23916: (QA follow-up) Remove stray changes and fix typo