Carmen made a mistake and this merge is invalid. See the bug in bugzilla for
more info. Reverting.

Revert "Merge pull request #16048 from mcjimenez/bug923449"

This reverts commit 3b0bc1c5dbd09cdb84dfa492b49dc3403b945020, reversing
changes made to fdea06af4276c37cb83fdd4cd3c551be7109bef1.