diff --git a/spec/CloudCode.spec.js b/spec/CloudCode.spec.js
index a5a89f334d..260b7cc120 100644
--- a/spec/CloudCode.spec.js
+++ b/spec/CloudCode.spec.js
@@ -1339,7 +1339,7 @@ describe('Cloud Code', () => {
       object.set('before', 'save');
     });
 
-    Parse.Cloud.define('removeme', (req, res) => {
+    Parse.Cloud.define('removeme', () => {
       const testObject = new TestObject();
       return testObject
         .save()
@@ -1350,11 +1350,10 @@ describe('Cloud Code', () => {
         .then(object => {
           object.unset('remove');
           return object.save();
-        })
-        .catch(res.error);
+        });
     });
 
-    Parse.Cloud.define('removeme2', (req, res) => {
+    Parse.Cloud.define('removeme2', () => {
       const testObject = new TestObject();
       return testObject
         .save()
@@ -1365,8 +1364,7 @@ describe('Cloud Code', () => {
         .then(object => {
           object.unset('remove');
           return object.save();
-        })
-        .catch(res.error);
+        });
     });
 
     Parse.Cloud.run('removeme')
diff --git a/src/Routers/FunctionsRouter.js b/src/Routers/FunctionsRouter.js
index 85f5960196..2dc5d1f28e 100644
--- a/src/Routers/FunctionsRouter.js
+++ b/src/Routers/FunctionsRouter.js
@@ -99,7 +99,7 @@ export class FunctionsRouter extends PromiseRouter {
     });
   }
 
-  static createResponseObject(resolve, reject, message) {
+  static createResponseObject(resolve, reject) {
     return {
       success: function (result) {
         resolve({
@@ -112,7 +112,6 @@ export class FunctionsRouter extends PromiseRouter {
         const error = triggers.resolveError(message);
         reject(error);
       },
-      message: message,
     };
   }
   static handleCloudFunction(req) {
@@ -144,7 +143,7 @@ export class FunctionsRouter extends PromiseRouter {
       const userString =
         req.auth && req.auth.user ? req.auth.user.id : undefined;
       const cleanInput = logger.truncateLogMessage(JSON.stringify(params));
-      const { success, error, message } = FunctionsRouter.createResponseObject(
+      const { success, error } = FunctionsRouter.createResponseObject(
         result => {
           try {
             const cleanResult = logger.truncateLogMessage(
@@ -186,7 +185,7 @@ export class FunctionsRouter extends PromiseRouter {
           return triggers.maybeRunValidator(request, functionName);
         })
         .then(() => {
-          return theFunction(request, { message });
+          return theFunction(request);
         })
         .then(success, error);
     });