Revert "Issue #404 - Save photos to Amazon S3"

This was supposed to be part of 3.4.0 and not 3.3.1.

This reverts commit d4358816fbbed3293ac717591fbec648d7ec11bc.