Avoid internals, get conduit 1.2 support