Revert "Merge branch 'hotfix-1.11.22' into develop"

This reverts commit 6a46a5c83e5703fd314de6cd058ee60dec8fa832, reversing
changes made to 1e880c5ad1bb77314c2f758739e339dccce0b49c.