This reverts commit 118ddbd719. The 1.25.2 version introduces a regression which is currently unfixed.
118ddbd719