Fix side effect of pulling #505 which caused sql server integration tests to fail