Undo of changes in ref d330946