Revert "[delivers #62492392 #62501694]"

This reverts commit 096ed45ab5f13ccf048076f84dd62c9d4e9a9df8.