diff --git a/hphp/compiler/builtin_symbols.cpp b/hphp/compiler/builtin_symbols.cpp
index a1ad7a1be..d373ae17f 100644
--- a/hphp/compiler/builtin_symbols.cpp
+++ b/hphp/compiler/builtin_symbols.cpp
@@ -100,7 +100,7 @@ int BuiltinSymbols::NumGlobalNames() {
     sizeof(BuiltinSymbols::GlobalNames[0]);
 }
 
-static TypePtr typePtrFromDataType(DataType dt) {
+static TypePtr typePtrFromDataType(DataType dt, TypePtr unknown) {
   switch (dt) {
     case KindOfNull:    return Type::Null;
     case KindOfBoolean: return Type::Boolean;
@@ -111,7 +111,7 @@ static TypePtr typePtrFromDataType(DataType dt) {
     case KindOfObject:  return Type::Object;
     case KindOfUnknown:
     default:
-      return Type::Any;
+      return unknown;
   }
 }
 
@@ -142,7 +142,7 @@ FunctionScopePtr BuiltinSymbols::ImportFunctionScopePtr(AnalysisResultPtr ar,
     if (pinfo->attribute & ClassInfo::IsReference) {
       f->setRefParam(idx);
     }
-    f->setParamType(ar, idx, typePtrFromDataType(pinfo->argType));
+    f->setParamType(ar, idx, typePtrFromDataType(pinfo->argType, Type::Any));
     if (pinfo->valueLen) {
       f->setParamDefault(idx, pinfo->value, pinfo->valueLen,
                          std::string(pinfo->valueText, pinfo->valueTextLen));
@@ -150,7 +150,8 @@ FunctionScopePtr BuiltinSymbols::ImportFunctionScopePtr(AnalysisResultPtr ar,
   }
 
   if (method->returnType != KindOfNull) {
-    f->setReturnType(ar, typePtrFromDataType(method->returnType));
+    f->setReturnType(ar, typePtrFromDataType(method->returnType,
+                                             Type::Variant));
   }
 
   f->setClassInfoAttribute(attrs);
@@ -249,7 +250,8 @@ void BuiltinSymbols::ImportExtProperties(AnalysisResultPtr ar,
       modifiers->add(T_STATIC);
     }
 
-    dest->add(pinfo->name.data(), typePtrFromDataType(pinfo->type),
+    dest->add(pinfo->name.data(),
+              typePtrFromDataType(pinfo->type, Type::Variant),
               false, ar, ExpressionPtr(), modifiers);
   }
 }
@@ -264,9 +266,9 @@ void BuiltinSymbols::ImportExtConstants(AnalysisResultPtr ar,
     // And that if it's deferred (SID) it'll be a String.
     ClassInfo::ConstantInfo *cinfo = *it;
     dest->add(cinfo->name.data(),
-              cinfo->isDeferred()
-                ? (cinfo->isCallback() ? Type::Object : Type::String)
-                : typePtrFromDataType(cinfo->getValue().getType()),
+              cinfo->isDeferred() ?
+              (cinfo->isCallback() ? Type::Object : Type::String) :
+              typePtrFromDataType(cinfo->getValue().getType(), Type::Variant),
               ExpressionPtr(), ar, ConstructPtr());
   }
 }
@@ -286,7 +288,8 @@ ClassScopePtr BuiltinSymbols::ImportClassScopePtr(AnalysisResultPtr ar,
     stdIfaces.push_back(it->data());
   }
 
-  ClassScopePtr cl(new ClassScope(ar, cls->getName().data(), parent.data(), stdIfaces, methods));
+  ClassScopePtr cl(new ClassScope(ar, cls->getName().data(), parent.data(),
+                                  stdIfaces, methods));
   for (uint i = 0; i < methods.size(); ++i) {
     methods[i]->setOuterScope(cl);
   }
diff --git a/hphp/test/quick/builtin_return.php b/hphp/test/quick/builtin_return.php
new file mode 100644
index 000000000..6135a3113
--- /dev/null
+++ b/hphp/test/quick/builtin_return.php
@@ -0,0 +1,14 @@
+<?php
+// Copyright 2004-present Facebook. All Rights Reserved.
+
+function foo(array $data) {
+  $duplicate_click = idx($data, 'duplicate_click');
+  if ($duplicate_click === 'false') {
+    $duplicate_click = false;
+  } else {
+    $duplicate_click = (bool)$duplicate_click;
+  }
+  return $duplicate_click;
+}
+
+var_dump(foo(array()));
diff --git a/hphp/test/quick/builtin_return.php.expect b/hphp/test/quick/builtin_return.php.expect
new file mode 100644
index 000000000..5c0c0681d
--- /dev/null
+++ b/hphp/test/quick/builtin_return.php.expect
@@ -0,0 +1 @@
+bool(false)