Revert "Performance improvement made to plugin"

This reverts commit ed057a4ebfe824f095f26a552410fa38cabd0788.