Re: [f21/master] Disable payloads that failed to setup (#1162732)