Amend PR47184 backport proposal: s/DefaultHandler/DefaultMapping/ as per discussion on the list and wrowe subsequent veto.