(MODULES-1330) Change order of revokation