Revert "Merge plugin improvement commit"