Work on bug 1107706