patch dont-always-recover.patch