Revert "Performance improvement made to plugin"

This reverts commit b7c08942db20d038ace657f56ccbd5e6ffb9f63c.