Remove s3 module; going back to s3file, as it was before.