Work on bug 1107706
Filed bug 1113305