Revert file storage backends on -dev
Merge pull request #738 from jasonthomas/s3

Revert file storage backends on -dev