diff --git a/typo3/sysext/core/Classes/Resource/ResourceStorage.php b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
index 875f0a3d5530b52a60a140dbbef51d153c981cde..1656c6a5be3ac123342617831784685d0316bb30 100644
--- a/typo3/sysext/core/Classes/Resource/ResourceStorage.php
+++ b/typo3/sysext/core/Classes/Resource/ResourceStorage.php
@@ -796,24 +796,23 @@ class ResourceStorage {
 	}
 
 	/**
-	 * Get file by identifier
+	 * Get information about a file
 	 *
-	 * @param \TYPO3\CMS\Core\Resource\FileInterface $identifier
+	 * @param \TYPO3\CMS\Core\Resource\FileInterface $fileObject
 	 * @return array
 	 */
-	public function getFileInfo($identifier) {
-		return $this->driver->getFileInfo($identifier);
+	public function getFileInfo(FileInterface $fileObject) {
+		return $this->driver->getFileInfo($fileObject);
 	}
 
 	/**
-	 * Get file by identifier
+	 * Get information about a file by its identifier
 	 *
-	 * @deprecated To be removed before final release of FAL. Use combination of getFileInfoByIdentifier() with a file object as argument instead.
 	 * @param string $identifier
-	 * @return \TYPO3\CMS\Core\Resource\FileInterface
+	 * @return array
 	 */
 	public function getFileInfoByIdentifier($identifier) {
-		return $this->driver->getFileInfoByIdentifier($identifier);
+		throw new \BadMethodCallException("The method ResourceStorage::getFileInfoByIdentifier() has been deprecated. Please fix your method call and use getFileInfo with the file object instead.", 1346577887);
 	}
 
 	/**
@@ -1967,4 +1966,4 @@ class ResourceStorage {
 }
 
 
-?>
\ No newline at end of file
+?>