Ensure temp commits get rolled back