Revert unintentional merge.
This reverts commit ce4151d0130481df6364ad5a540a6afeaef00e0b.
This reverts commit dfa9fa8c1802b4cc6835d8af8a745477534c2936.
Merge pull request #15224 from KevinGrandon/revert_15223

Bug 952629 - Revert unintentional merge.