Revert "Wrap everything in error handling block"

This reverts commit 15146f72d4625d390d64fe445f7ee121106ef83d.
Chef upstream is taking a different patch for this issue.
Revert "Moved runlock inside begin/rescue/ensure"

This reverts commit b56d48c6eae1c637514556d670a9b57ee4daf98c.
Chef upstream is taking a different patch for this issue.