This should probably use `@conn` as it did before.