diff --git a/tools/aidl/aidl_language_y.y b/tools/aidl/aidl_language_y.y
index 4b1442a93b7f9..cc04d151bc146 100644
--- a/tools/aidl/aidl_language_y.y
+++ b/tools/aidl/aidl_language_y.y
@@ -87,9 +87,7 @@ parcelable_decl:
                                                         b->name = $2.buffer;
                                                         b->package = g_currentPackage ? strdup(g_currentPackage) : NULL;
                                                         b->semicolon_token = $3.buffer;
-                                                        // TODO: Since we're having problems with funbundling, make all parcelables also flattenables.
-                                                        // b->flattening_methods = PARCELABLE_DATA;
-                                                        b->flattening_methods = PARCELABLE_DATA | RPC_DATA;
+                                                        b->flattening_methods = PARCELABLE_DATA;
                                                         $$.user_data = b;
                                                     }
     |   PARCELABLE ';'                              {