Revert "Merge branch 'feat_updsqlstdlib'"

This reverts commit 9ca016b5ad578115b8e966bad4a3f07cd3ab3030, reversing
changes made to ea86b6036c03ef4c52e0b5cd35058d865d56af87.