diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java
index 49b7c87ad3..99897412b2 100644
--- a/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java
+++ b/src/org/labkey/test/components/ui/entities/EntityBulkInsertDialog.java
@@ -440,16 +440,6 @@ protected void waitForReady()
         getWrapper().shortWait().until(ExpectedConditions.elementToBeClickable( elementCache().addRowsButton ));
     }
 
-    /**
-     * File upload fields append "-fileUpload" to the field's fieldKey
-     * @param fieldIdentifier Identifier for the field; name ({@link String}) or fieldKey ({@link FieldKey})
-     * @return FieldKey with expected suffix
-     */
-    public static FieldKey fileUploadFieldKey(CharSequence fieldIdentifier)
-    {
-        return FieldKey.fromFieldKey(FieldKey.fromName(fieldIdentifier) + "-fileUpload");
-    }
-
     @Override
     protected ElementCache newElementCache()
     {
@@ -514,7 +504,7 @@ public ReactDateTimePicker dateInput(CharSequence fieldIdentifier)
 
         public FileAttachmentContainer fileUploadField(CharSequence fieldIdentifier)
         {
-            return new FileAttachmentContainer(formRow(fileUploadFieldKey(fieldIdentifier)), getDriver());
+            return new FileAttachmentContainer(formRow(fieldIdentifier), getDriver());
         }
 
         public List<WebElement> fieldLabels()
diff --git a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java
index cd7acb5beb..289c1e7007 100644
--- a/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java
+++ b/src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java
@@ -245,7 +245,6 @@ public String getDateField(CharSequence fieldIdentifier)
      */
     public FileAttachmentContainer getFileField(CharSequence fieldIdentifier)
     {
-        fieldIdentifier = EntityBulkInsertDialog.fileUploadFieldKey(fieldIdentifier);
         return enableAndWait(fieldIdentifier, elementCache().fileUploadField(fieldIdentifier));
     }
 
@@ -272,7 +271,7 @@ public EntityBulkUpdateDialog removeFile(CharSequence fieldIdentifier)
 
     public FileUploadField getExistingFileField(String fieldIdentifier)
     {
-        return elementCache().fileField(fieldIdentifier);
+        return enableAndWait(fieldIdentifier, elementCache().fileField(fieldIdentifier));
     }
 
     /**