diff --git a/src/reflect/type.go b/src/reflect/type.go
index 328f5900..dd96105e 100644
--- a/src/reflect/type.go
+++ b/src/reflect/type.go
@@ -465,7 +465,8 @@ func (t *rawType) isNamed() bool {
 }
 
 func TypeOf(i interface{}) Type {
-	return ValueOf(i).typecode
+	typecode, _ := decomposeInterface(i)
+	return (*rawType)(typecode)
 }
 
 func PtrTo(t Type) Type { return PointerTo(t) }