Continued on bug 1107706