Revert "ZEN-11054: ported from ZEN-11222"

This reverts commit c821b86e3eb620bf1eeea7800dcf0ad2cbc524f3.