Revert 3ffbd27cdd and PR #10985 , this change doesn't fix any issue and instead breaks the logic of the instance event.
Revert 3ffbd27cdd and PR #10985 , this change doesn't fix any issue and instead breaks the logic of the instance event.