Revert "NXP-10836: Temporary fix to ensure to have instance facets on refresh"

This reverts commit b98ab1a2fba9ccfa601d922d0c763a2fb30cfa69.