This is a partial revert of commit 94d5d30c
Relates #16637
And related package changes. Would be lovely if this could make it to 3.21, since 47 is unfortunately less usable than 45