Restored plugin to commit prior to refactor; old change that reverted