Revert "Move CIR props to Vendor 2/2"

This reverts commit 248828c6f6cea073830842aa7a1e4f49402fec31.