First pass at supporting direct downloads from S3
Hack to reduce code dup