diff --git a/.meteor/versions b/.meteor/versions
index 486a546ac..93f4b0009 100644
--- a/.meteor/versions
+++ b/.meteor/versions
@@ -1,4 +1,4 @@
-accounts-base@2.2.3
+accounts-base@2.2.4
 accounts-oauth@1.4.1
 accounts-password@2.3.1
 aldeed:collection2@2.10.0
@@ -10,11 +10,11 @@ allow-deny@1.1.1
 arillo:flow-router-helpers@0.5.2
 audit-argument-checks@1.0.7
 autoupdate@1.8.0
-babel-compiler@7.9.0
+babel-compiler@7.9.2
 babel-runtime@1.5.1
 base64@1.0.12
 binary-heap@1.0.11
-blaze@2.6.0
+blaze@2.6.1
 blaze-tools@1.1.3
 boilerplate-generator@1.7.1
 caching-compiler@1.2.2
@@ -94,8 +94,8 @@ meteorhacks:subs-manager@1.6.4
 meteortesting:browser-tests@1.3.5
 meteortesting:mocha@2.0.3
 meteortesting:mocha-core@8.0.1
-minifier-css@1.6.0
-minifier-js@2.7.4
+minifier-css@1.6.1
+minifier-js@2.7.5
 minifiers@1.1.8-faster-rebuild.0
 minimongo@1.8.0
 modern-browsers@0.1.8
@@ -123,7 +123,7 @@ ongoworks:speakingurl@1.1.0
 ordered-dict@1.1.0
 ostrio:cookies@2.7.2
 ostrio:cstorage@4.0.1
-ostrio:files@2.0.1
+ostrio:files@2.2.1
 ostrio:i18n@3.2.0
 pascoual:pdfkit@1.0.7
 peerlibrary:assert@0.3.0
diff --git a/models/attachments.js b/models/attachments.js
index 148b224a1..f1368121f 100644
--- a/models/attachments.js
+++ b/models/attachments.js
@@ -40,13 +40,17 @@ Attachments = new FilesCollection({
   debug: false, // Change to `true` for debugging
   collectionName: 'attachments',
   allowClientCode: true,
+/* Commenting out because this custom namingFunction did not work:
+   https://github.com/veliovgroup/Meteor-Files/issues/847
+
   namingFunction(opts) {
-    const filenameWithoutExtension = opts.name.replace(/(.+)\..+/, "$1");
+    const filenameWithoutExtension = opts.meta.name.replace(/(.+)\..+/, "$1");
     const ret = opts.meta.fileId + "-original-" + filenameWithoutExtension;
     // remove fileId from meta, it was only stored there to have this information here in the namingFunction function
     delete opts.meta.fileId;
     return ret;
   },
+*/
   storagePath() {
     const ret = fileStoreStrategyFactory.storagePath;
     return ret;