Bug 807492 - reland after fixing a typo r=try-green