Revert "simplified plugin"

This reverts commit bc6f09bf8246213411a1eee91e4cce259cbf3266.