Revert "tentative fix for RC5 lift build problem."

This reverts commit cb4fd65.

Conflicts:

	src/compiler/scala/tools/nsc/symtab/Types.scala
	src/compiler/scala/tools/nsc/typechecker/Contexts.scala

Author: jrudolph

src/compiler/scala/tools/nsc/typechecker/Contexts.scala

@@ -552,7 +552,6 @@ trait Contexts { self: Analyzer =>
         (  (ab.isTerm || ab == rootMirror.RootClass)
         || (accessWithin(ab) || accessWithinLinked(ab)) &&
              (  !sym.hasLocalFlag
-             || sym.owner.isImplClass // allow private local accesses to impl classes
              || sym.isProtected && isSubThisType(pre, sym.owner)
              || pre =:= sym.owner.thisType
              )

src/reflect/scala/reflect/internal/Types.scala

@@ -1392,11 +1392,9 @@ trait Types extends api.Types { self: SymbolTable =>
   final class UniqueThisType(sym: Symbol) extends ThisType(sym) with UniqueType { }
 
   object ThisType extends ThisTypeExtractor {
-    def apply(sym: Symbol): Type = {
-      if (!phase.erasedTypes) unique(new UniqueThisType(sym))
-      else if (sym.isImplClass) sym.typeOfThis
-      else sym.tpe
-    }
+    def apply(sym: Symbol): Type =
+      if (phase.erasedTypes) sym.tpe
+      else unique(new UniqueThisType(sym))
   }
 
   /** A class for singleton types of the form `<prefix>.<sym.name>.type`.