Undo fix for bug 54847