try introduce rollback of the instance state on rollback

Change-Id: Ie783099f3b522a77a410db43fd2bf9ea0e7ab45c