Realizing this is really tied to panels support, so maybe we could live with this as is until they land in stable.