This is unrelated and clashes with trunk changes to the plugin.