I think the CTRL+Z feature is good enough to go with now...  There's probably corner cases where it's hosed up, but that's what beta testing is for..