Refine 'Revert' button behaviour