[BACKLOG-872] Rollback fixes due to the introduction of the Property type in metadata

type in metadat