--- js/linkit.dialog.js	Fri Mar 30 22:40:07 2012
+++ js/linkit.dialog.js	Fri Mar 30 22:40:39 2012
@@ -159,9 +159,7 @@
  */
 Drupal.linkit.dialog.IMCECallback = function(file, win) {
   Drupal.linkit.dialog.populateFields({
-     path: win.imce.decode(Drupal.settings.basePath +
-         Drupal.settings.linkit.publicFilesDirectory +
-         '/' + file.relpath)
+     path: win.imce.decode(Drupal.settings.linkit.publicFilesDirectory + '/' + file.relpath)
   });
   win.close();
 };
--- plugins/linkit_plugins/linkit-plugin-entity.class.php	Wed Mar 28 22:27:18 2012
+++ plugins/linkit_plugins/linkit-plugin-entity.class.php	Fri Mar 30 22:28:18 2012
@@ -83,11 +83,7 @@
   function buildPath($entity, $options = array()) {
     // Create the URI for the entity.
     $uri = entity_uri($this->plugin['entity_type'], $entity);
-
-    // We have to set alias to TRUE as we don't want an alias back.
-    $options += array('alias' => TRUE);
-
-    return parent::buildPath($uri['path'], $options);
+    return $uri['path'];
   }
 
   /**