Let's drop in a comment here with "TODO" that would remind us that we need to somehow make this work for old style plugins.