Revert "Merge pull request #19236 from frsela/STK/Bug1009188"

This reverts commit 5936e35e386a65e98d97392799b411203f3b737a, reversing
changes made to c0d92f9e1c0580208ee83a7f2db01e56c2c21490.
Revert "Merge pull request #19268 from crh0716/1010394"

This reverts commit 829e1d6e6806509d5010faa5ba900f0cad6523f9, reversing
changes made to 5936e35e386a65e98d97392799b411203f3b737a.