Went back to per-file base64 encoding