Further deferring all cirrus modules, S3 and ec2 rename are broken