diff --git a/core/procedures.js b/core/procedures.js
index beb4a17b8..c6ff2153c 100644
--- a/core/procedures.js
+++ b/core/procedures.js
@@ -89,6 +89,7 @@ Blockly.Procedures.findLegalName = function(name, block) {
     // Flyouts can have multiple procedures called 'do something'.
     return name;
   }
+  name = name.replace(/\s+/g, '');
   while (!Blockly.Procedures.isLegalName_(name, block.workspace, block)) {
     // Collision with another procedure.
     var r = name.match(/^(.*?)(\d+)$/);
diff --git a/core/procedures.js.rej b/core/procedures.js.rej
index 5d1a97784..acfcc20de 100644
--- a/core/procedures.js.rej
+++ b/core/procedures.js.rej
@@ -1,20 +1,4 @@
 ***************
-*** 99,104 ****
-      // Flyouts can have multiple procedures called 'procedure'.
-      return name;
-    }
-    while (!Blockly.Procedures.isLegalName(name, block.workspace, block)) {
-      // Collision with another procedure.
-      var r = name.match(/^(.*?)(\d+)$/);
---- 99,105 ----
-      // Flyouts can have multiple procedures called 'procedure'.
-      return name;
-    }
-+   name = name.replace(/\s+/g, '');
-    while (!Blockly.Procedures.isLegalName(name, block.workspace, block)) {
-      // Collision with another procedure.
-      var r = name.match(/^(.*?)(\d+)$/);
-***************
 *** 255,266 ****
    * @param {!Blockly.Workspace} workspace The workspace to delete callers from.
    * @param {!Array.<string>} paramNames Array of new parameter names.