diff --git a/e2e/utilities/repo-client/apis/nodes/node-body-create.ts b/e2e/utilities/repo-client/apis/nodes/node-body-create.ts
index 10dd0842a..b070a8773 100755
--- a/e2e/utilities/repo-client/apis/nodes/node-body-create.ts
+++ b/e2e/utilities/repo-client/apis/nodes/node-body-create.ts
@@ -33,7 +33,7 @@ export class NodeBodyCreate {
         public name: string,
         public nodeType: string,
         public relativePath: string = '/',
-        public aspectNames?: string[], // workaround for REPO-4772
+        public aspectNames?: string[],
         public properties?: any[]
     ) {}
 }
diff --git a/e2e/utilities/repo-client/apis/nodes/nodes-api.ts b/e2e/utilities/repo-client/apis/nodes/nodes-api.ts
index 4db0b18c9..c3484328e 100755
--- a/e2e/utilities/repo-client/apis/nodes/nodes-api.ts
+++ b/e2e/utilities/repo-client/apis/nodes/nodes-api.ts
@@ -231,6 +231,9 @@ export class NodesApi extends RepoApi {
   }
 
   async createNode(nodeType: string, name: string, parentId: string = '-my-', title: string = '', description: string = '', imageProps: any = null, author: string = '', majorVersion: boolean = true, aspectNames: string[] = null): Promise<NodeEntry|null> {
+    if (!aspectNames) {
+      aspectNames = ['cm:versionable']; // workaround for REPO-4772
+    }
     const nodeBody = {
         name,
         nodeType,
@@ -255,9 +258,6 @@ export class NodesApi extends RepoApi {
   }
 
   async createFile(name: string, parentId: string = '-my-', title: string = '', description: string = '', author: string = '', majorVersion: boolean = true, aspectNames: string[] = null): Promise<NodeEntry> {
-    if (!aspectNames) {
-      aspectNames = ['cm:versionable'] // workaround for REPO-4772
-    }
     try {
       return await this.createNode('cm:content', name, parentId, title, description, null, author, majorVersion, aspectNames);
     } catch (error) {
diff --git a/e2e/utilities/utils.ts b/e2e/utilities/utils.ts
index 78c8a3abd..2eaa2aa42 100755
--- a/e2e/utilities/utils.ts
+++ b/e2e/utilities/utils.ts
@@ -75,7 +75,9 @@ export class Utils {
   static retryCall(fn: () => Promise<any>, retry: number = 30, delay: number = 1000): Promise<any> {
     const pause = duration => new Promise(res => setTimeout(res, duration));
 
-    const run = retries => fn().catch(err => (retries > 1 ? pause(delay).then(() => run(retries - 1)) : Promise.reject(err)));
+    const run = retries => {
+      return fn().catch(err => (retries > 1 ? pause(delay).then(() => run(retries - 1)) : Promise.reject(err)));
+    }
 
     return run(retry);
   }