address review comment for bug 865871
landed patch for bug 865871