Revert "Performance improvement made to plugin"

This reverts commit f4f761b2a6085c81ce1d68fa083bbaf530cc16bd.