@@ -70,8 +70,16 @@ func DecodeNestedRawExtensionOrUnknown(d runtime.Decoder, ext *runtime.RawExtens

 	}

 	obj, gvk, err := d.Decode(ext.Raw, nil, nil)

 	if err != nil {

-		// TODO: record mime-type with the object

 		unk := &runtime.Unknown{Raw: ext.Raw}

+		if runtime.IsNotRegisteredError(err) {

+			if _, gvk, err := d.Decode(ext.Raw, nil, unk); err == nil {

+				unk.APIVersion = gvk.GroupVersion().String()

+				unk.Kind = gvk.Kind

+				ext.Object = unk

+				return

+			}

+		}

+		// TODO: record mime-type with the object

 		if gvk != nil {

 			unk.APIVersion = gvk.GroupVersion().String()

 			unk.Kind = gvk.Kind

@@ -144,7 +144,7 @@ func fuzzInternalObject(t *testing.T, forVersion unversioned.GroupVersion, item

 			case 0:

 				j.AttributeRestrictions = &authorizationapi.IsPersonalSubjectAccessReview{}

 			case 1:

-				j.AttributeRestrictions = &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Type", APIVersion: "other"}, Raw: []byte(`{"apiVersion":"other","kind":"Type"}`)}

+				j.AttributeRestrictions = &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Type", APIVersion: "other"}, ContentType: "application/json", Raw: []byte(`{"apiVersion":"other","kind":"Type"}`)}

 			default:

 				j.AttributeRestrictions = nil

 			}

@@ -380,7 +380,7 @@ func TestSpecificRoundTrips(t *testing.T) {

 							Raw:    []byte(`{"kind":"LDAPSyncConfig","apiVersion":"v1","bindDN":"second"}`),

 						}},

 						"test3": {Configuration: runtime.RawExtension{

-							Object: &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Unknown", APIVersion: "some/version"}, Raw: []byte(`{"kind":"Unknown","apiVersion":"some/version"}`)},

+							Object: &runtime.Unknown{TypeMeta: runtime.TypeMeta{Kind: "Unknown", APIVersion: "some/version"}, ContentType: "application/json", Raw: []byte(`{"kind":"Unknown","apiVersion":"some/version"}`)},

 							Raw:    []byte(`{"kind":"Unknown","apiVersion":"some/version"}`),

 						}},

 						"test4": {},

@@ -437,7 +437,8 @@ func fuzzerFor(t *testing.T, version unversioned.GroupVersion, src rand.Source)

 					APIVersion: "unknown.group/unknown",

 					Kind:       "Something",

 				},

-				Raw: []byte(`{"apiVersion":"unknown.group/unknown","kind":"Something","someKey":"someValue"}`),

+				ContentType: "application/json",

+				Raw:         []byte(`{"apiVersion":"unknown.group/unknown","kind":"Something","someKey":"someValue"}`),

 			}

 		},

 		func(j *unversioned.TypeMeta, c fuzz.Continue) {