Revert "Fix re"

This reverts commit 18329e2edf73450e803f07e1c3ffc48f25ff1d6a.
Revert "Revert "Revert "Refactor plugin re"""

This reverts commit e5ee610d4caab0774a2b42c441541be344c36776.