Revert "Merge pull request #22880 from frsela/STK/Bug1026556"

This reverts commit 66c5ef590b6fd75865fd215dc632c561afdeffc9, reversing
changes made to 111257ab1d64cc4d27295de8b92fc553aedcc858.