[#1841] make plugins.toolkit more like a normal module