My real goal is to put up a PR to deprecate the old plugins, but I can’t land that without this or an alternative solution