Otherwise, we're going to end up with an import cycle between the adt and this version.
Also, correctly handle multiple ADT versions.