Revert "Merge branch 'hotfix/3424'"

Reverts #3424 due to BC issue reported in #3576

This reverts commit c8c637523fe1a5705ba01684386a8ef63e675464, reversing
changes made to 054f7a0f95bb919cce95faa53ced0a525017602f.