Revert "Bug 989852 - Fix v1.3 rebase error."

This reverts commit 1336b65dada5ced6c0ca2fe3545f1ac9173708c1.
Revert "Merge pull request #17943 from frsela/STK/Bug989852"

This reverts commit 7287309e0e65b937ac3cebae7254565ef1c82e3a.