Bug 826581 - Follow-up fix. r=dvander