Fix merge conflict from backout of bug 872806