diff --git a/local-cli/link/unlink.js b/local-cli/link/unlink.js
index 99b66f20d..0ac7c8b8a 100644
--- a/local-cli/link/unlink.js
+++ b/local-cli/link/unlink.js
@@ -113,19 +113,20 @@ function unlink(args, config) {
 
   const allDependencies = getDependencyConfig(config, getProjectDependencies());
   const otherDependencies = filter(allDependencies, d => d.name !== packageName);
-  const thisDependency = find(allDependencies, d => d.name === packageName);
   const iOSDependencies = compact(otherDependencies.map(d => d.config.ios));
 
   const tasks = [
-    () => promisify(thisDependency.config.commands.preunlink || commandStub),
+    () => promisify(dependency.commands.preunlink || commandStub),
     () => unlinkDependencyAndroid(project.android, dependency, packageName),
     () => unlinkDependencyIOS(project.ios, dependency, packageName, iOSDependencies),
     () => unlinkDependencyWindows(project.windows, dependency, packageName),
-    () => promisify(thisDependency.config.commands.postunlink || commandStub)
+    () => promisify(dependency.commands.postunlink || commandStub)
   ];
 
   return promiseWaterfall(tasks)
     .then(() => {
+      // @todo move all these to `tasks` array, just like in
+      // link
       const assets = difference(
         dependency.assets,
         flatten(allDependencies, d => d.assets)