Oh wait, I'm dumb, this is a different PR than the adapter one.  Will fix.