diff --git a/src/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php b/src/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
index 45bae13548aff54c3352b1ed1f1b0a495b1e5990..042dfa477da4ffc8af2aeecbc41ba851226dd772 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageHandlerFlatFile.php
@@ -124,7 +124,7 @@ class MetaDataStorageHandlerFlatFile extends MetaDataStorageSource
 
         // add the entity id of an entry to each entry in the metadata
         foreach ($metadataSet as $entityId => &$entry) {
-            $entry = $this->updateEntityID($set, $entityId, $entry);
+            $entry['entityID'] = $entityId;
         }
 
         $this->cachedMetadata[$set] = $metadataSet;
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php b/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
index 249d4a4346a96a04142029871b73aa2c7e40aa5b..f841584336f020adf21b012b194acec9ef11cfd5 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageHandlerPdo.php
@@ -129,7 +129,7 @@ class MetaDataStorageHandlerPdo extends MetaDataStorageSource
         }
 
         foreach ($metadataSet as $entityId => &$entry) {
-            $entry = $this->updateEntityID($set, $entityId, $entry);
+            $entry['entityID'] = $entityId;
         }
 
         $this->cachedMetadata[$set] = $metadataSet;
diff --git a/src/SimpleSAML/Metadata/MetaDataStorageSource.php b/src/SimpleSAML/Metadata/MetaDataStorageSource.php
index 6f2864ca9d9a611c3fc9cdc684616f3e3788cc32..b22b5aaef4e51e0ad3c9b1a8a408643b24087869 100644
--- a/src/SimpleSAML/Metadata/MetaDataStorageSource.php
+++ b/src/SimpleSAML/Metadata/MetaDataStorageSource.php
@@ -346,24 +346,4 @@ abstract class MetaDataStorageSource
             throw new \Exception('Can not generate dynamic EntityID for metadata of this type: [' . $set . ']');
         }
     }
-
-
-    /**
-     * Updates the metadata entry's entity id and returns the modified array.
-     * If it is explicit the entityid array key is updated to the entityId that was provided.
-     *
-     * @param string $metadataSet a metadata set (saml20-idp-hosted, saml20-sp-remote, etc)
-     * @param string $entityId the entity id we are modifying
-     * @param array $metadataEntry the fully populated metadata entry
-     * @return array modified metadata to include the valid entityid
-     *
-     * @throws \Exception
-     */
-    protected function updateEntityID(string $metadataSet, string $entityId, array $metadataEntry): array
-    {
-        // set the entityid metadata array key to the provided entity id
-        $modifiedMetadataEntry = $metadataEntry;
-        $modifiedMetadataEntry['entityid'] = $entityId;
-        return $modifiedMetadataEntry;
-    }
 }