Revert "Performance improvement made to plugin"

This reverts commit c0c57c554e441cfbd1daf302b07454939e0664c2.