Undo merge PR#405