Merge "Really don't use TEMP_FAILURE_RETRY with close in recovery."