Revert "Merge pull request #21804 from gtorodelvalle/v2.0-bug-1018283-uplifting"

This reverts commit a89900c2a38cf2b61245807c75ffdb76d49e72f6, reversing
changes made to abdb110c6421c53221ab2d59ddb536bfc062e7a8.