Updated for bug 839961 as followup