ZEN-10187: Revert the changes of a previous version

This reverts commits 92c13a29ac4d91bf9abbd1aa9a021e2e273d7210, 25aa5dc3d934f0fd9f3719001c1b12c5c032482a, 4994b378bfa6b6e62e1764d46c5dd26110771ca3.