Merge "Revert "Remove unsupported and mostly non-functional Mssql support""