Revert "Add optional plugin handle parameter"

This reverts commit 93ad6f1f518cfcbd8822788970dcd7ee3e37e592.