Revert "Merge branch 'wip/smcv/deprecated-construct-prop' into 'main'"

This reverts merge request !2888 (merged). We're in hard code freeze and I forgot about that.