fix: #3583190 Rollback BC breaking changes from MR 353

Frank Mablyrequested to merge
issue/domain-3583190:3583190-rollback-bc-breaking-changes into 3.x

Closes #3583190

Merge request reports