Update according to comment #4 on bug 1081567