b7a382f097
This reverts commit 1a03d5c93e.
The reason is that original change seems to be breaking (see KT-44137).
^KT-44137 Relates
^KT-37796 Open