diff --git a/src/services/services.ts b/src/services/services.ts
index a3e6d7a5445..05aeb47f7c6 100644
--- a/src/services/services.ts
+++ b/src/services/services.ts
@@ -2754,10 +2754,6 @@ module ts {
                 if (symbolKind === ScriptElementKind.memberGetAccessorElement || symbolKind === ScriptElementKind.memberSetAccessorElement) {
                     symbolKind = ScriptElementKind.memberVariableElement;
                 }
-                else if (symbol.name === "undefined") {
-                    // undefined is symbol and not property
-                    symbolKind = ScriptElementKind.variableElement;
-                }
 
                 var type = typeResolver.getTypeOfSymbol(symbol);
                 if (type) {
diff --git a/tests/cases/fourslash/quickInfoOnUndefined.ts b/tests/cases/fourslash/quickInfoOnUndefined.ts
index 252da49d4fe..1bb516d2c18 100644
--- a/tests/cases/fourslash/quickInfoOnUndefined.ts
+++ b/tests/cases/fourslash/quickInfoOnUndefined.ts
@@ -3,6 +3,13 @@
 ////function foo(a: string) {
 ////}
 ////foo(/*1*/undefined);
+////var x = {
+////    undefined: 10
+////};
+////x./*2*/undefined = 30;
 
 goTo.marker('1');
-verify.quickInfoIs('(var) undefined');
\ No newline at end of file
+verify.quickInfoIs('(var) undefined');
+
+goTo.marker('2');
+verify.quickInfoIs('(property) undefined: number');
\ No newline at end of file