Revert "Merge pull request #1561 from dalcde/st-deprecated"

This reverts commit d04f941a117d2c200093462b938c7705b9534c9f, reversing
changes made to bc50928f92d42b60cfef9bafbb67a76de316fe75.