Reverted changes from previous commit. It broke the plugin.