diff --git a/hphp/idl/base.php b/hphp/idl/base.php
index 4112e337c..e492087b2 100644
--- a/hphp/idl/base.php
+++ b/hphp/idl/base.php
@@ -256,11 +256,6 @@ function EndClass() {
 }
 
 function idl_parse_type($t) {
-  // Named object types
-  if (!strncmp($t, 'Object:', 7)) {
-    return substr($t, 7);
-  }
-
   if (defined($t) && ($v = constant($t)) &&
       is_integer($v) && ($v > 0) && ($v < TypeMask)) {
     return $v;
diff --git a/hphp/idl/continuation.idl.json b/hphp/idl/continuation.idl.json
index 262e24d5e..ac9282131 100644
--- a/hphp/idl/continuation.idl.json
+++ b/hphp/idl/continuation.idl.json
@@ -6,7 +6,7 @@
         {
             "name": "hphp_create_continuation",
             "return": {
-                "type": "Object:Continuation"
+                "type": "Object"
             },
             "args": [
                 {
diff --git a/hphp/idl/fb.idl.json b/hphp/idl/fb.idl.json
index df243390c..9d9cfbbb9 100644
--- a/hphp/idl/fb.idl.json
+++ b/hphp/idl/fb.idl.json
@@ -1054,6 +1054,9 @@
                 "HasDocComment",
                 "HipHopSpecific"
             ],
+            "return": {
+                "type": null
+            },
             "args": [
                 {
                     "name": "filename",
diff --git a/hphp/idl/icu_ucnv.idl.json b/hphp/idl/icu_ucnv.idl.json
index 2d6b1b974..6552eb6c7 100644
--- a/hphp/idl/icu_ucnv.idl.json
+++ b/hphp/idl/icu_ucnv.idl.json
@@ -19,6 +19,9 @@
                     "flags": [
                         "HasDocComment"
                     ],
+                    "return": {
+                        "type": null
+                    },
                     "args": [
                         {
                             "name": "toEncoding",
@@ -64,6 +67,9 @@
                     "flags": [
                         "HasDocComment"
                     ],
+                    "return": {
+                        "type": null
+                    },
                     "args": [
                         {
                             "name": "encoding",
@@ -91,6 +97,9 @@
                     "flags": [
                         "HasDocComment"
                     ],
+                    "return": {
+                        "type": null
+                    },
                     "args": [
                         {
                             "name": "encoding",
diff --git a/hphp/idl/options.idl.json b/hphp/idl/options.idl.json
index 9efd6ac22..077bb9075 100644
--- a/hphp/idl/options.idl.json
+++ b/hphp/idl/options.idl.json
@@ -893,7 +893,9 @@
             "flags": [
                 "HasDocComment"
             ],
-            "return": null,
+            "return": {
+                "type": null
+            },
             "args": [
             ]
         },
@@ -903,7 +905,9 @@
             "flags": [
                 "HasDocComment"
             ],
-            "return": null,
+            "return": {
+                "type": null
+            },
             "args": [
             ]
         },
diff --git a/hphp/idl/output.idl.json b/hphp/idl/output.idl.json
index be980bc82..0c34210d5 100644
--- a/hphp/idl/output.idl.json
+++ b/hphp/idl/output.idl.json
@@ -473,6 +473,9 @@
                 "HipHopSpecific",
                 "NoInjection"
             ],
+            "return": {
+                "type": null
+            },
             "args": [
             ]
         }
diff --git a/hphp/system/class_map.cpp b/hphp/system/class_map.cpp
index 14f6c0e88..14f265f96 100644
--- a/hphp/system/class_map.cpp
+++ b/hphp/system/class_map.cpp
@@ -13623,7 +13623,7 @@ const char *g_class_map[] = {
   NULL,
   NULL,
   (const char *)0x10006040, "hphp_create_continuation", "", (const char*)0, (const char*)0,
-  "/**\n * ( excerpt from\n * http://php.net/manual/en/function.hphp-create-continuation.php )\n *\n *\n * @clsname    string\n * @funcname   string\n * @origFuncName\n *             string\n * @args       map\n *\n * @return     Continuation\n *\n */",
+  "/**\n * ( excerpt from\n * http://php.net/manual/en/function.hphp-create-continuation.php )\n *\n *\n * @clsname    string\n * @funcname   string\n * @origFuncName\n *             string\n * @args       map\n *\n * @return     object\n */",
   (const char *)0x40 /* KindOfObject */, (const char *)0x2000, "clsname", "", (const char *)0x14 /* KindOfString */, "", (const char *)0, "", (const char *)0, NULL,
   (const char *)0x2000, "funcname", "", (const char *)0x14 /* KindOfString */, "", (const char *)0, "", (const char *)0, NULL,
   (const char *)0x2000, "origFuncName", "", (const char *)0x14 /* KindOfString */, "", (const char *)0, "", (const char *)0, NULL,