Revert No Recovery as can not build OTAPackage