Revert "DSTify ToSql"

This causes ICEs

This reverts commit c63a7f9a151c954892007d54172507413cbe2d57.
Fix a desynchronization issue