Bug 830260 followup to address review comment.