Correct undo behavior

Bug: 7307293
Change-Id: I72f814acd3625024f1e2aeccec4abfd28ad3319b
2 files changed