Revert "Merge pull request #17943 from frsela/STK/Bug989852"

This reverts commit 4202bbda7118abe1f2bf22d44e6c836f2469a0da.