Revert plugin.helper change, closes #1015