Revert "Fix viper undo breakage from undo-boundary changes"