revert: 21d1d216, entity sync with config

Closes #3606129

Merge request reports

Loading