Move dbintrospector back in, not ready yet