Somewhat backwards incompatible change but I couldn't get it to work with Filesystem and S3 at the same time.