From a4b288f35be527d7d10d6323d665ad9cd8719cf0 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Fri, 7 Mar 2014 22:25:29 -0500
Subject: [PATCH] Revert "Fix task macro's handling of Symbol owners in
 <qual>.value"

This reverts commit 3017bfcd07466a2c3aa9bc5fe4760929db8ae0ed.

This was causing sbt to be unable to compile.  Reverting temporarily until
we have a shot at a full fix.
---
 .../sbt-test/project/setting-macro/build.sbt  |  9 --------
 .../main/scala/sbt/appmacro/ContextUtil.scala | 22 +++++++++----------
 2 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/sbt/src/sbt-test/project/setting-macro/build.sbt b/sbt/src/sbt-test/project/setting-macro/build.sbt
index add6ef28e..d48af8bc9 100644
--- a/sbt/src/sbt-test/project/setting-macro/build.sbt
+++ b/sbt/src/sbt-test/project/setting-macro/build.sbt
@@ -15,12 +15,3 @@ demo := {
   val (n, s) = parser.parsed
   s * n
 }
-
-// Tests for correct Symbol owner structure in the lifted qualifiers of
-// the `.value` macro within a task macro. (#1150)
-val touchIfChanged = taskKey[Unit]("")
-
-touchIfChanged := { 
-  val foo = (sourceDirectory in Compile).apply(base => base).value.get
-  ()
-}
diff --git a/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala b/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
index 389fd33f8..c0c849fab 100644
--- a/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
+++ b/util/appmacro/src/main/scala/sbt/appmacro/ContextUtil.scala
@@ -226,19 +226,17 @@ final class ContextUtil[C <: Context](val ctx: C)
 		object appTransformer extends Transformer
 		{
 			override def transform(tree: Tree): Tree =
-				tree match {
-					case ApplyTree(TypeApply(Select(_, nme), targ :: Nil), qual :: Nil) =>
-						changeOwner(qual, currentOwner, initialOwner) // Fixes https://github.com/sbt/sbt/issues/1150
-						subWrapper(nme.decoded, targ.tpe, qual, tree) match {
-							case Converted.Success(t, finalTx) => finalTx(t)
-							case Converted.Failure(p,m) => ctx.abort(p, m)
-							case _: Converted.NotApplicable[_] => super.transform(tree)
-						}
+				tree match
+				{
+					case ApplyTree(TypeApply(Select(_, nme), targ :: Nil), qual :: Nil) => subWrapper(nme.decoded, targ.tpe, qual, tree) match {
+						case Converted.Success(t, finalTx) => finalTx(t)
+						case Converted.Failure(p,m) => ctx.abort(p, m)
+						case _: Converted.NotApplicable[_] => super.transform(tree)
+					}
 					case _ => super.transform(tree)
 				}
 		}
-		appTransformer.atOwner(initialOwner) {
-			appTransformer.transform(t)
-		}
+
+		appTransformer.transform(t)
 	}
-}
+}
\ No newline at end of file