Revert "Performance improvement made to plugin"

This reverts commit 019616bd8031dbff544c84bb9d151686ef1a7c59.