Undo changes from d92b1f3e76 to see if it fixes bug 873280