Backport of #11288: Removed duplicated touching

Backport of #11306 PR

Fixes #11288 for 4-0-stable

/cc @carlosantoniodasilva