Revert "Resource Identity handling improved"

This reverts commit 4ee6bbf598cff53b33398cb8cf24eda124f0b6fa.