The change introduced regressions, so find another way to fix. This reverts commit d077c03686. [ci skip]
d077c03686