Update according to comment on bug 1081567