Fix s3 support

So thaaaaats how it works.

Change-Id: Ic3d5314137766b2e3125efd050d39e4df8e1645f