Revert "Merge pull request #10967 from frsela/STK/Bug893614"

This reverts commit c340cc85151a3387746c1e0cf742bb8c2e8b09fb, reversing
changes made to 4e56aba1d98a43f492508bfe1b32ce4eac8cd893.