Removed workaround for 'Cancel'. Handling revoke button visibility.