ENG-7267 SQLCMD backed out some recent over-engineering