Revert "Merge branch 'feat_updsqlstdlib'"

This reverts commit e104ab2ed0e8235e38fa4c320b5972f9815552ed, reversing
changes made to badf91c63e28288f48a31975143f01d8d2d91565.