Broken. Fiddling with plugin API. This commit is broken.