Revert "Merge pull request #19237 from frsela/STK/Bug1009188_v1.4"

This reverts commit ddf9c2997ecd46a0e58d1e115ce38a21485e72e1, reversing
changes made to 8806eebe8f1555b1f924166f921ab831a5e3560c.
Revert "Merge pull request #19269 from crh0716/1010394_v1.4"

This reverts commit 8eca5c19f4923432d55e676475236473252962a4, reversing
changes made to ddf9c2997ecd46a0e58d1e115ce38a21485e72e1.