better use of plugin infrastructure that got an update in fadb306fdf