diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 5ab976aaf4f886de4073778eee4ef9928ad10220..431b6a1adb8b20716c7f34fa3fccc42bb8825cbd 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -180,7 +180,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			$stat["gid"] = "";
 			$stat["rdev"] = "";
 			$stat["size"] = $this->filesize($path);
-			$stat["atime"] = $this->fileatime($path);
 			$stat["mtime"] = $this->filemtime($path);
 			$stat["ctime"] = $this->filectime($path);
 			$stat["blksize"] = "";
@@ -354,27 +353,6 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 	
-	public function fileatime($path) {
-		if ($path == "" || $path == "/") {
-			$atime = 0; 
-			if ($dh = $this->opendir($path)) {
-				while (($filename = readdir($dh)) !== false) {
-					$tempatime = $this->fileatime($filename);
-					if ($tempatime > $atime) {
-						$atime = $tempatime;
-					}
-				}
-				return $atime;
-			}
-		} else {
-			$source = $this->getSource($path);
-			if ($source) {
-				$storage = OC_Filesystem::getStorage($source);
-				return $storage->fileatime($this->getInternalPath($source));
-			}
-		}
-	}
-	
 	public function file_get_contents($path) {
 		$source = $this->getSource($path);
 		if ($source) {
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 549b7015a6a11aef72b4d3fdceb0f7b310cfdd12..235fc8bf284f7707a009608147e364b86baae3e8 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -34,7 +34,7 @@
  * A post-proxy recieves 2 arguments, the filepath and the result of the operation.
  * The return calue of the post-proxy will be used as the new result of the operation
  * The operations that have a post-proxy are
- *      file_get_contents, is_file, is_dir, file_exists, stat, is_readable, is_writable, fileatime, filemtime, filectime, file_get_contents, getMimeType, hash, free_space and search
+ *      file_get_contents, is_file, is_dir, file_exists, stat, is_readable, is_writable, filemtime, filectime, file_get_contents, getMimeType, hash, free_space and search
  */
 
 class OC_FileProxy{
diff --git a/lib/filestorage.php b/lib/filestorage.php
index 34fa6457fd28a4b9a9d1f52023ad2e97b22c8219..90071a86dbe9559a5a432177e44046720ef37d77 100644
--- a/lib/filestorage.php
+++ b/lib/filestorage.php
@@ -39,7 +39,6 @@ class OC_Filestorage{
 	public function readfile($path){}
 	public function filectime($path){}
 	public function filemtime($path){}
-	public function fileatime($path){}
 	public function file_get_contents($path){}
 	public function file_put_contents($path,$data){}
 	public function unlink($path){}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 9e29f85071a22d815928eb4bcdb58f44e8ef789e..7711116db354b5c33b6b0cb054932a439d174bb2 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -67,9 +67,6 @@ class OC_Filestorage_Local extends OC_Filestorage{
 	public function filemtime($path){
 		return filemtime($this->datadir.$path);
 	}
-	public function fileatime($path){
-		return fileatime($this->datadir.$path);
-	}
 	public function file_get_contents($path){
 		return file_get_contents($this->datadir.$path);
 	}
diff --git a/lib/filesystem.php b/lib/filesystem.php
index e28a3c5667e9d706056e1d5ad5e661b05818b8d4..a25e8697985c20ca8484aba829ae40b24c5002ea 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -251,9 +251,6 @@ class OC_Filesystem{
 	static public function filemtime($path){
 		return self::basicOperation('filemtime',$path);
 	}
-	static public function fileatime($path){
-		return self::basicOperation('filemtime',$path);
-	}
 	static public function file_get_contents($path){
 		return self::basicOperation('file_get_contents',$path,array('read'));
 	}