Adding ICE undo feature

@jbau & @sefk