Fully reverted as unsure of compatibility with S3