Revert "Merge branch 'feat_updsqlstdlib'"

This reverts commit cdca45625c9aa67889710529c21c1aaaf6cb4f92, reversing
changes made to 9c1eefa4eb6e9bf9e9e9d32f628fa4409fda57c6.
Revert "Merge branch 'feat_updsqlstdlib'"

This reverts commit 9c1eefa4eb6e9bf9e9e9d32f628fa4409fda57c6, reversing
changes made to 3d452e32af3ed8a5557e2dc116bd1c109517e334.