Answer by Jim
Rebasing bug 1107706