Revert "Deferr reset_transaction and disconnect plugins"

This reverts commit c9430a93c4b183452043eabb7c8b41ba6c6c786c.
Another attempt to fix hook stomping