BM-24540 revert changes from e3248f3 (BM-17029)