Bug 842772 - Followup to address review comments.