Move undo up to the controller level.

Change-Id: I1fa2d921132c0d66c677b428f570c60672471ad9
18 files changed