Revert "Merge branch 'deployment-iid-transaction-improvement' into 'master'"

This reverts commit eeba0ecb (!17696 (merged)), reversing changes made to 86bb8213.

This was causing pipelines not to be created (#34444 (closed)).