Undo redo completion of VIX-433.

Merge after or in place of my SnapFix branch as this is based on it.