diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 1bdb734b2c..e50eea8260 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -475,7 +475,6 @@ phutil_register_library_map(array(
     'PhabricatorFileStorageEngine' => 'applications/files/engine/base',
     'PhabricatorFileStorageEngineSelector' => 'applications/files/engineselector/base',
     'PhabricatorFileTransformController' => 'applications/files/controller/transform',
-    'PhabricatorFileURI' => 'applications/files/uri',
     'PhabricatorFileUploadController' => 'applications/files/controller/upload',
     'PhabricatorFileUploadException' => 'applications/files/exception/upload',
     'PhabricatorFileUploadView' => 'applications/files/view/upload',
diff --git a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
index b0caa6a16a..bfcecdbd2b 100644
--- a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
@@ -867,7 +867,6 @@ class DifferentialChangesetParser {
     $range_len    = null,
     $mask_force   = array()) {
 
-
     // "Top level" renders are initial requests for the whole file, versus
     // requests for a specific range generated by clicking "show more". We
     // generate property changes and "shield" UI elements only for toplevel
@@ -915,21 +914,37 @@ class DifferentialChangesetParser {
         }
 
         if ($old_phid || $new_phid) {
+
+          // grab the files, (micro) optimization for 1 query not 2
+          $file_phids = array();
           if ($old_phid) {
-            $old_uri = PhabricatorFileURI::getViewURIForPHID($old_phid);
-            $old = phutil_render_tag(
-              'img',
-              array(
-                'src' => $old_uri,
-              ));
+            $file_phids[] = $old_phid;
           }
           if ($new_phid) {
-            $new_uri = PhabricatorFileURI::getViewURIForPHID($new_phid);
-            $cur = phutil_render_tag(
-              'img',
-              array(
-                'src' => $new_uri,
-              ));
+            $file_phids[] = $new_phid;
+          }
+
+          $files = id(new PhabricatorFile())->loadAllWhere(
+            'phid IN (%Ls)',
+            $file_phids);
+
+          foreach ($files as $file) {
+            if (empty($file)) {
+              continue;
+            }
+            if ($file->getPHID() == $old_phid) {
+              $old = phutil_render_tag(
+                'img',
+                array(
+                  'src' => $file->getBestURI(),
+                ));
+            } else {
+              $cur = phutil_render_tag(
+                'img',
+                array(
+                  'src' => $file->getBestURI(),
+                ));
+            }
           }
         }
 
diff --git a/src/applications/differential/parser/changeset/__init__.php b/src/applications/differential/parser/changeset/__init__.php
index 26ebee053e..15d1a09dc3 100644
--- a/src/applications/differential/parser/changeset/__init__.php
+++ b/src/applications/differential/parser/changeset/__init__.php
@@ -12,7 +12,7 @@ phutil_require_module('phabricator', 'aphront/writeguard');
 phutil_require_module('phabricator', 'applications/differential/constants/changetype');
 phutil_require_module('phabricator', 'applications/differential/storage/changeset');
 phutil_require_module('phabricator', 'applications/differential/view/inlinecomment');
-phutil_require_module('phabricator', 'applications/files/uri');
+phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/markup/syntax');
 phutil_require_module('phabricator', 'infrastructure/diff/engine');
 phutil_require_module('phabricator', 'infrastructure/events/constant/type');
diff --git a/src/applications/feed/story/differential/PhabricatorFeedStoryDifferential.php b/src/applications/feed/story/differential/PhabricatorFeedStoryDifferential.php
index b4ab02028f..87b974b97a 100644
--- a/src/applications/feed/story/differential/PhabricatorFeedStoryDifferential.php
+++ b/src/applications/feed/story/differential/PhabricatorFeedStoryDifferential.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -66,9 +66,8 @@ class PhabricatorFeedStoryDifferential extends PhabricatorFeedStory {
     }
 
     if ($full_size) {
-      if (!empty($objects[$author_phid])) {
-        $image_phid = $objects[$author_phid]->getProfileImagePHID();
-        $image_uri  = PhabricatorFileURI::getViewURIForPHID($image_phid);
+      if (!empty($handles[$author_phid])) {
+        $image_uri = $handles[$author_phid]->getImageURI();
         $view->setImage($image_uri);
       }
 
diff --git a/src/applications/feed/story/differential/__init__.php b/src/applications/feed/story/differential/__init__.php
index 93cc715499..d875c8aafd 100644
--- a/src/applications/feed/story/differential/__init__.php
+++ b/src/applications/feed/story/differential/__init__.php
@@ -9,7 +9,6 @@
 phutil_require_module('phabricator', 'applications/differential/constants/action');
 phutil_require_module('phabricator', 'applications/feed/story/base');
 phutil_require_module('phabricator', 'applications/feed/view/story');
-phutil_require_module('phabricator', 'applications/files/uri');
 
 phutil_require_module('phutil', 'markup');
 
diff --git a/src/applications/feed/story/maniphest/PhabricatorFeedStoryManiphest.php b/src/applications/feed/story/maniphest/PhabricatorFeedStoryManiphest.php
index 91265a9d9c..4961ec2116 100644
--- a/src/applications/feed/story/maniphest/PhabricatorFeedStoryManiphest.php
+++ b/src/applications/feed/story/maniphest/PhabricatorFeedStoryManiphest.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,6 +42,7 @@ class PhabricatorFeedStoryManiphest extends PhabricatorFeedStory {
     $task_phid = $data->getValue('taskPHID');
 
     $objects = $this->getObjects();
+    $handles = $this->getHandles();
     $action = $data->getValue('action');
 
     $view = new PhabricatorFeedStoryView();
@@ -82,9 +83,8 @@ class PhabricatorFeedStoryManiphest extends PhabricatorFeedStory {
     $view->setEpoch($data->getEpoch());
 
     if ($full_size) {
-      if (!empty($objects[$author_phid])) {
-        $image_phid = $objects[$author_phid]->getProfileImagePHID();
-        $image_uri  = PhabricatorFileURI::getViewURIForPHID($image_phid);
+      if (!empty($handles[$author_phid])) {
+        $image_uri = $handles[$author_phid]->getImageURI();
         $view->setImage($image_uri);
       }
 
diff --git a/src/applications/feed/story/maniphest/__init__.php b/src/applications/feed/story/maniphest/__init__.php
index 5a8b993c9f..e7e720c831 100644
--- a/src/applications/feed/story/maniphest/__init__.php
+++ b/src/applications/feed/story/maniphest/__init__.php
@@ -8,7 +8,6 @@
 
 phutil_require_module('phabricator', 'applications/feed/story/base');
 phutil_require_module('phabricator', 'applications/feed/view/story');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/maniphest/constants/action');
 
 phutil_require_module('phutil', 'markup');
diff --git a/src/applications/feed/story/phriction/PhabricatorFeedStoryPhriction.php b/src/applications/feed/story/phriction/PhabricatorFeedStoryPhriction.php
index 8ab7289914..c55b8ccabb 100644
--- a/src/applications/feed/story/phriction/PhabricatorFeedStoryPhriction.php
+++ b/src/applications/feed/story/phriction/PhabricatorFeedStoryPhriction.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,9 +62,8 @@ class PhabricatorFeedStoryPhriction extends PhabricatorFeedStory {
     }
 
     if ($full_size) {
-      if (!empty($objects[$author_phid])) {
-        $image_phid = $objects[$author_phid]->getProfileImagePHID();
-        $image_uri  = PhabricatorFileURI::getViewURIForPHID($image_phid);
+      if (!empty($handles[$author_phid])) {
+        $image_uri = $handles[$author_phid]->getImageURI();
         $view->setImage($image_uri);
       }
 
diff --git a/src/applications/feed/story/phriction/__init__.php b/src/applications/feed/story/phriction/__init__.php
index 22e9dabeb5..a78d7ce3ec 100644
--- a/src/applications/feed/story/phriction/__init__.php
+++ b/src/applications/feed/story/phriction/__init__.php
@@ -8,7 +8,6 @@
 
 phutil_require_module('phabricator', 'applications/feed/story/base');
 phutil_require_module('phabricator', 'applications/feed/view/story');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/phriction/constants/action');
 
 phutil_require_module('phutil', 'markup');
diff --git a/src/applications/feed/story/status/PhabricatorFeedStoryStatus.php b/src/applications/feed/story/status/PhabricatorFeedStoryStatus.php
index 51a281370c..5051106402 100644
--- a/src/applications/feed/story/status/PhabricatorFeedStoryStatus.php
+++ b/src/applications/feed/story/status/PhabricatorFeedStoryStatus.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,9 +44,8 @@ class PhabricatorFeedStoryStatus extends PhabricatorFeedStory {
       '<strong>'.$handles[$author_phid]->renderLink().'</strong>');
     $view->setEpoch($data->getEpoch());
 
-    if (!empty($objects[$author_phid])) {
-      $image_phid = $objects[$author_phid]->getProfileImagePHID();
-      $image_uri  = PhabricatorFileURI::getViewURIForPHID($image_phid);
+    if (!empty($handles[$author_phid])) {
+      $image_uri = $handles[$author_phid]->getImageURI();
       $view->setImage($image_uri);
     }
 
diff --git a/src/applications/feed/story/status/__init__.php b/src/applications/feed/story/status/__init__.php
index b177546848..56ccbac488 100644
--- a/src/applications/feed/story/status/__init__.php
+++ b/src/applications/feed/story/status/__init__.php
@@ -8,7 +8,6 @@
 
 phutil_require_module('phabricator', 'applications/feed/story/base');
 phutil_require_module('phabricator', 'applications/feed/view/story');
-phutil_require_module('phabricator', 'applications/files/uri');
 
 phutil_require_module('phutil', 'markup');
 
diff --git a/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php b/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php
index 3de8297418..f5c5c6ccb3 100644
--- a/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php
+++ b/src/applications/files/controller/macrolist/PhabricatorFileMacroListController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,11 +52,12 @@ class PhabricatorFileMacroListController extends PhabricatorFileController {
       $handles = id(new PhabricatorObjectHandleData($author_phids))
         ->loadHandles();
     }
+    $files_map = mpull($files, null, 'getPHID');
 
     $rows = array();
     foreach ($macros as $macro) {
-      $src = PhabricatorFileURI::getViewURIForPHID($macro->getFilePHID());
       $file_phid = $macro->getFilePHID();
+      $file = $files_map[$file_phid];
       $author_link = isset($author_phids[$file_phid])
         ? $handles[$author_phids[$file_phid]]->renderLink()
         : null;
@@ -73,13 +74,13 @@ class PhabricatorFileMacroListController extends PhabricatorFileController {
         phutil_render_tag(
           'a',
           array(
-            'href'    => $src,
+            'href'    => $file->getBestURI(),
             'target'  => '_blank',
           ),
           phutil_render_tag(
             'img',
             array(
-              'src' => $src,
+              'src' => $file->getBestURI(),
             ))),
         javelin_render_tag(
           'a',
diff --git a/src/applications/files/controller/macrolist/__init__.php b/src/applications/files/controller/macrolist/__init__.php
index 5a673f8568..a14eac9d80 100644
--- a/src/applications/files/controller/macrolist/__init__.php
+++ b/src/applications/files/controller/macrolist/__init__.php
@@ -9,7 +9,6 @@
 phutil_require_module('phabricator', 'applications/files/controller/base');
 phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/files/storage/imagemacro');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/files/view/sidenav');
 phutil_require_module('phabricator', 'applications/phid/handle/data');
 phutil_require_module('phabricator', 'infrastructure/javelin/markup');
diff --git a/src/applications/files/controller/proxy/PhabricatorFileProxyController.php b/src/applications/files/controller/proxy/PhabricatorFileProxyController.php
index 760b5c69e3..1b29b874ff 100644
--- a/src/applications/files/controller/proxy/PhabricatorFileProxyController.php
+++ b/src/applications/files/controller/proxy/PhabricatorFileProxyController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -52,7 +52,16 @@ class PhabricatorFileProxyController extends PhabricatorFileController {
     }
 
     if ($proxy) {
-      $view_uri = PhabricatorFileURI::getViewURIForPHID($proxy->getFilePHID());
+      $file = id(new PhabricatorFile())->loadOneWhere('phid = %s',
+                                                      $proxy->getFilePHID());
+      if ($file) {
+        $view_uri = $file->getBestURI();
+      } else {
+        $bad_phid = $proxy->getFilePHID();
+        throw new Exception(
+          "Unable to load file with phid {$bad_phid}."
+        );
+      }
       return id(new AphrontRedirectResponse())->setURI($view_uri);
     }
 
diff --git a/src/applications/files/controller/proxy/__init__.php b/src/applications/files/controller/proxy/__init__.php
index be1d269685..578884117f 100644
--- a/src/applications/files/controller/proxy/__init__.php
+++ b/src/applications/files/controller/proxy/__init__.php
@@ -12,7 +12,6 @@ phutil_require_module('phabricator', 'aphront/writeguard');
 phutil_require_module('phabricator', 'applications/files/controller/base');
 phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/files/storage/proxyimage');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'infrastructure/env');
 
 phutil_require_module('phutil', 'utils');
diff --git a/src/applications/files/controller/transform/PhabricatorFileTransformController.php b/src/applications/files/controller/transform/PhabricatorFileTransformController.php
index 2929374ba4..dca8e11598 100644
--- a/src/applications/files/controller/transform/PhabricatorFileTransformController.php
+++ b/src/applications/files/controller/transform/PhabricatorFileTransformController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -113,10 +113,21 @@ class PhabricatorFileTransformController extends PhabricatorFileController {
   private function buildTransformedFileResponse(
     PhabricatorTransformedFile $xform) {
 
+    $file = id(new PhabricatorFile())->loadOneWhere(
+      'phid = %s',
+      $xform->getTransformedPHID());
+    if ($file) {
+      $uri = $file->getBestURI();
+    } else {
+      $bad_phid = $xform->getTransformedPHID();
+      throw new Exception(
+        "Unable to load file with phid {$bad_phid}."
+      );
+    }
+
     // TODO: We could just delegate to the file view controller instead,
     // which would save the client a roundtrip, but is slightly more complex.
-    return id(new AphrontRedirectResponse())->setURI(
-      PhabricatorFileURI::getViewURIForPHID($xform->getTransformedPHID()));
+    return id(new AphrontRedirectResponse())->setURI($uri);
   }
 
   private function executeThumbTransform(PhabricatorFile $file, $x, $y) {
diff --git a/src/applications/files/controller/transform/__init__.php b/src/applications/files/controller/transform/__init__.php
index fcf40a17a1..d313b9bf00 100644
--- a/src/applications/files/controller/transform/__init__.php
+++ b/src/applications/files/controller/transform/__init__.php
@@ -14,7 +14,6 @@ phutil_require_module('phabricator', 'applications/files/controller/base');
 phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/files/storage/transformed');
 phutil_require_module('phabricator', 'applications/files/transform');
-phutil_require_module('phabricator', 'applications/files/uri');
 
 phutil_require_module('phutil', 'utils');
 
diff --git a/src/applications/files/controller/view/PhabricatorFileViewController.php b/src/applications/files/controller/view/PhabricatorFileViewController.php
index 6201e67fd3..7af33eb9e3 100644
--- a/src/applications/files/controller/view/PhabricatorFileViewController.php
+++ b/src/applications/files/controller/view/PhabricatorFileViewController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -184,6 +184,11 @@ class PhabricatorFileViewController extends PhabricatorFileController {
     $transformations = id(new PhabricatorTransformedFile())->loadAllWhere(
       'originalPHID = %s',
       $file->getPHID());
+    $transformed_phids = mpull($transformations, 'getTransformedPHID');
+    $transformed_files = id(new PhabricatorFile())->loadAllWhere(
+      'phid in (%Ls)',
+      $transformed_phids);
+    $transformed_map = mpull($transformed_files, null, 'getPHID');
     $rows = array();
     foreach ($transformations as $transformed) {
       $phid = $transformed->getTransformedPHID();
@@ -192,7 +197,7 @@ class PhabricatorFileViewController extends PhabricatorFileController {
         phutil_render_tag(
           'a',
           array(
-            'href' => PhabricatorFileURI::getViewURIForPHID($phid),
+            'href' => $transformed_map[$phid]->getBestURI(),
           ),
           $phid));
     }
diff --git a/src/applications/files/controller/view/__init__.php b/src/applications/files/controller/view/__init__.php
index 715df129d0..067d3a607a 100644
--- a/src/applications/files/controller/view/__init__.php
+++ b/src/applications/files/controller/view/__init__.php
@@ -13,7 +13,6 @@ phutil_require_module('phabricator', 'aphront/response/redirect');
 phutil_require_module('phabricator', 'applications/files/controller/base');
 phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/files/storage/transformed');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/people/storage/user');
 phutil_require_module('phabricator', 'infrastructure/env');
 phutil_require_module('phabricator', 'view/control/table');
diff --git a/src/applications/files/uri/PhabricatorFileURI.php b/src/applications/files/uri/PhabricatorFileURI.php
deleted file mode 100644
index 8f813a82bf..0000000000
--- a/src/applications/files/uri/PhabricatorFileURI.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-
-/*
- * Copyright 2011 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-final class PhabricatorFileURI {
-
-  public static function getViewURIForPHID($phid) {
-
-    // TODO: Get rid of this class, the advent of the applet attack makes the
-    // tiny optimization it represented effectively obsolete.
-
-    $file = id(new PhabricatorFile())->loadOneWhere(
-      'phid = %s',
-      $phid);
-    if ($file) {
-      return $file->getViewURI();
-    }
-
-    return null;
-  }
-
-}
diff --git a/src/applications/files/uri/__init__.php b/src/applications/files/uri/__init__.php
deleted file mode 100644
index bedf04f978..0000000000
--- a/src/applications/files/uri/__init__.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * This file is automatically generated. Lint this module to rebuild it.
- * @generated
- */
-
-
-
-phutil_require_module('phabricator', 'applications/files/storage/file');
-
-phutil_require_module('phutil', 'utils');
-
-
-phutil_require_source('PhabricatorFileURI.php');
diff --git a/src/applications/paste/controller/view/PhabricatorPasteViewController.php b/src/applications/paste/controller/view/PhabricatorPasteViewController.php
index 86ee7d63d7..69ca9701ec 100644
--- a/src/applications/paste/controller/view/PhabricatorPasteViewController.php
+++ b/src/applications/paste/controller/view/PhabricatorPasteViewController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -62,7 +62,7 @@ class PhabricatorPasteViewController extends PhabricatorPasteController {
         ),
         'Fork This'));
 
-    $raw_uri = PhabricatorFileURI::getViewURIForPHID($paste->getFilePHID());
+    $raw_uri = $file->getBestURI();
     $paste_panel->addButton(
       phutil_render_tag(
         'a',
diff --git a/src/applications/paste/controller/view/__init__.php b/src/applications/paste/controller/view/__init__.php
index a148c94e13..892964bc8c 100644
--- a/src/applications/paste/controller/view/__init__.php
+++ b/src/applications/paste/controller/view/__init__.php
@@ -9,7 +9,6 @@
 phutil_require_module('phabricator', 'aphront/response/400');
 phutil_require_module('phabricator', 'aphront/response/404');
 phutil_require_module('phabricator', 'applications/files/storage/file');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/markup/syntax');
 phutil_require_module('phabricator', 'applications/paste/controller/base');
 phutil_require_module('phabricator', 'applications/paste/storage/paste');
diff --git a/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php b/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
index eb7a40fc91..b3abeb5e40 100644
--- a/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
+++ b/src/applications/people/controller/profile/PhabricatorPeopleProfileController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -115,7 +115,12 @@ class PhabricatorPeopleProfileController extends PhabricatorPeopleController {
     }
 
     $src_phid = $user->getProfileImagePHID();
-    $picture = PhabricatorFileURI::getViewURIForPHID($src_phid);
+    $file = id(new PhabricatorFile())->loadOneWhere('phid = %s', $src_phid);
+    if ($file) {
+      $picture = $file->getBestURI();
+    } else {
+      $picture = null;
+    }
 
     $header = new PhabricatorProfileHeaderView();
     $header
diff --git a/src/applications/people/controller/profile/__init__.php b/src/applications/people/controller/profile/__init__.php
index 1793969090..110a677ab4 100644
--- a/src/applications/people/controller/profile/__init__.php
+++ b/src/applications/people/controller/profile/__init__.php
@@ -10,7 +10,7 @@ phutil_require_module('phabricator', 'aphront/response/404');
 phutil_require_module('phabricator', 'applications/auth/oauth/provider/base');
 phutil_require_module('phabricator', 'applications/feed/builder/feed');
 phutil_require_module('phabricator', 'applications/feed/query');
-phutil_require_module('phabricator', 'applications/files/uri');
+phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/markup/engine');
 phutil_require_module('phabricator', 'applications/people/controller/base');
 phutil_require_module('phabricator', 'applications/people/storage/profile');
diff --git a/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php b/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php
index c427008351..0d0194d571 100644
--- a/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php
+++ b/src/applications/people/controller/settings/panels/profile/PhabricatorUserProfileSettingsPanelController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -96,8 +96,14 @@ class PhabricatorUserProfileSettingsPanelController
       }
     }
 
-    $img_src = PhabricatorFileURI::getViewURIForPHID(
+    $file = id(new PhabricatorFile())->loadOneWhere(
+      'phid = %s',
       $user->getProfileImagePHID());
+    if ($file) {
+      $img_src = $file->getBestURI();
+    } else {
+      $img_src = null;
+    }
     $profile_uri = PhabricatorEnv::getURI('/p/'.$user->getUsername().'/');
 
     $form = new AphrontFormView();
diff --git a/src/applications/people/controller/settings/panels/profile/__init__.php b/src/applications/people/controller/settings/panels/profile/__init__.php
index 2b1c76b08e..545d4a9813 100644
--- a/src/applications/people/controller/settings/panels/profile/__init__.php
+++ b/src/applications/people/controller/settings/panels/profile/__init__.php
@@ -9,7 +9,6 @@
 phutil_require_module('phabricator', 'aphront/response/redirect');
 phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/files/transform');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/people/controller/settings/panels/base');
 phutil_require_module('phabricator', 'applications/people/storage/profile');
 phutil_require_module('phabricator', 'infrastructure/env');
diff --git a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php b/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
index 1b4b5f2159..031531fec9 100644
--- a/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
+++ b/src/applications/phid/handle/data/PhabricatorObjectHandleData.php
@@ -140,7 +140,7 @@ class PhabricatorObjectHandleData {
             $images = id(new PhabricatorFile())->loadAllWhere(
               'phid IN (%Ls)',
               $image_phids);
-            $images = mpull($images, 'getViewURI', 'getPHID');
+            $images = mpull($images, 'getBestURI', 'getPHID');
           }
 
           foreach ($phids as $phid) {
diff --git a/src/applications/project/controller/profile/PhabricatorProjectProfileController.php b/src/applications/project/controller/profile/PhabricatorProjectProfileController.php
index 52ecb766eb..d0408fd054 100644
--- a/src/applications/project/controller/profile/PhabricatorProjectProfileController.php
+++ b/src/applications/project/controller/profile/PhabricatorProjectProfileController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,15 @@ class PhabricatorProjectProfileController
     if (!$src_phid) {
       $src_phid = $user->getProfileImagePHID();
     }
-    $picture = PhabricatorFileURI::getViewURIForPHID($src_phid);
+    $file = id(new PhabricatorFile())->loadOneWhere('phid = %s',
+                                                    $src_phid);
+    if ($file) {
+      $picture = $file->getBestURI();
+    } else {
+      $picture = null;
+    }
+
+
 
     $nav_view = new AphrontSideNavFilterView();
     $uri = new PhutilURI('/project/view/'.$project->getID().'/');
diff --git a/src/applications/project/controller/profile/__init__.php b/src/applications/project/controller/profile/__init__.php
index e73f70338a..560c9119c2 100644
--- a/src/applications/project/controller/profile/__init__.php
+++ b/src/applications/project/controller/profile/__init__.php
@@ -9,7 +9,7 @@
 phutil_require_module('phabricator', 'aphront/response/404');
 phutil_require_module('phabricator', 'applications/feed/builder/feed');
 phutil_require_module('phabricator', 'applications/feed/query');
-phutil_require_module('phabricator', 'applications/files/uri');
+phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/maniphest/query');
 phutil_require_module('phabricator', 'applications/maniphest/view/tasksummary');
 phutil_require_module('phabricator', 'applications/phid/handle/data');
diff --git a/src/applications/search/view/searchresult/PhabricatorSearchResultView.php b/src/applications/search/view/searchresult/PhabricatorSearchResultView.php
index da12267086..756fe46e38 100644
--- a/src/applications/search/view/searchresult/PhabricatorSearchResultView.php
+++ b/src/applications/search/view/searchresult/PhabricatorSearchResultView.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -54,17 +54,7 @@ final class PhabricatorSearchResultView extends AphrontView {
       ),
       PhabricatorEnv::getProductionURI($handle->getURI()));
 
-    switch ($handle->getType()) {
-      case PhabricatorPHIDConstants::PHID_TYPE_USER:
-        if ($this->object) {
-          $img_phid = $this->object->getProfileImagePHID();
-          $img = PhabricatorFileURI::getViewURIForPHID($img_phid);
-        }
-        break;
-      default:
-        $img = null;
-        break;
-    }
+    $img = $handle->getImageURI();
 
     if ($img) {
       $img = phutil_render_tag(
diff --git a/src/applications/search/view/searchresult/__init__.php b/src/applications/search/view/searchresult/__init__.php
index 7c2ece7d97..3a6340257d 100644
--- a/src/applications/search/view/searchresult/__init__.php
+++ b/src/applications/search/view/searchresult/__init__.php
@@ -6,7 +6,6 @@
 
 
 
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/phid/constants');
 phutil_require_module('phabricator', 'infrastructure/celerity/api');
 phutil_require_module('phabricator', 'infrastructure/env');
diff --git a/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
index 185add2871..067a52421b 100644
--- a/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
+++ b/src/applications/slowvote/controller/poll/PhabricatorSlowvotePollController.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -403,8 +403,7 @@ class PhabricatorSlowvotePollController
             continue;
           }
 
-          $profile_image = PhabricatorFileURI::getViewURIForPHID(
-            $object->getProfileImagePHID());
+          $profile_image = $handle->getImageURI();
 
           $user_markup[] = phutil_render_tag(
             'a',
diff --git a/src/applications/slowvote/controller/poll/__init__.php b/src/applications/slowvote/controller/poll/__init__.php
index a463cd819b..33b8dd57dd 100644
--- a/src/applications/slowvote/controller/poll/__init__.php
+++ b/src/applications/slowvote/controller/poll/__init__.php
@@ -8,7 +8,6 @@
 
 phutil_require_module('phabricator', 'aphront/response/404');
 phutil_require_module('phabricator', 'aphront/response/redirect');
-phutil_require_module('phabricator', 'applications/files/uri');
 phutil_require_module('phabricator', 'applications/markup/engine');
 phutil_require_module('phabricator', 'applications/phid/handle/data');
 phutil_require_module('phabricator', 'applications/slowvote/controller/base');
diff --git a/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php b/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php
index 97137c35bf..0df253ebd8 100644
--- a/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php
+++ b/src/infrastructure/markup/remarkup/markuprule/imagemacro/PhabricatorRemarkupRuleImageMacro.php
@@ -1,7 +1,7 @@
 <?php
 
 /*
- * Copyright 2011 Facebook, Inc.
+ * Copyright 2012 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -69,11 +69,17 @@ class PhabricatorRemarkupRuleImageMacro
         $phid = $this->images[$matches[1]];
       }
 
+      $file = id(new PhabricatorFile())->loadOneWhere('phid = %s', $phid);
+      if ($file) {
+        $src_uri = $file->getBestURI();
+      } else {
+        $src_uri = null;
+      }
 
       $img = phutil_render_tag(
         'img',
         array(
-          'src'   => PhabricatorFileURI::getViewURIForPHID($phid),
+          'src'   => $src_uri,
           'alt'   => $matches[1],
           'title' => $matches[1]),
         null);
diff --git a/src/infrastructure/markup/remarkup/markuprule/imagemacro/__init__.php b/src/infrastructure/markup/remarkup/markuprule/imagemacro/__init__.php
index d742a178a2..5895c2c6fa 100644
--- a/src/infrastructure/markup/remarkup/markuprule/imagemacro/__init__.php
+++ b/src/infrastructure/markup/remarkup/markuprule/imagemacro/__init__.php
@@ -6,8 +6,8 @@
 
 
 
+phutil_require_module('phabricator', 'applications/files/storage/file');
 phutil_require_module('phabricator', 'applications/files/storage/imagemacro');
-phutil_require_module('phabricator', 'applications/files/uri');
 
 phutil_require_module('phutil', 'markup');
 phutil_require_module('phutil', 'markup/engine/remarkup/markuprule/base');