Remove method redefinition
Merge branch 'plugins-method-redefinition'