SAK-26043 revert for assignments