Myriad changes to make this work in an S3 only world