Revert "Trying out S3"

This reverts commit ca21e7a37b75e33e56dc8c2918c0fa04532c843b.