Revert "Performance improvement made to plugin"

This reverts commit 6373d8b45722f7129685991002a712d93a5de605.