Switch back to cfs:s3 after PR merged