Fix undoing of changes caused by previous commit