diff --git a/base/compiler/typeinfer.jl b/base/compiler/typeinfer.jl
index 12290f4dfc780..93851e5ba37bc 100644
--- a/base/compiler/typeinfer.jl
+++ b/base/compiler/typeinfer.jl
@@ -61,8 +61,8 @@ function typeinf(frame::InferenceState)
     for caller in frames
         caller.min_valid = min_valid
         caller.max_valid = max_valid
-        caller.src.min_world = min_valid % Int
-        caller.src.max_world = max_valid % Int
+        caller.src.min_world = min_valid
+        caller.src.max_world = max_valid
         if cached
             cache_result(caller.result, min_valid, max_valid)
         end
diff --git a/base/reflection.jl b/base/reflection.jl
index 084a885fb0cae..77f67e68852b1 100644
--- a/base/reflection.jl
+++ b/base/reflection.jl
@@ -1329,10 +1329,10 @@ has_bottom_parameter(t::Union) = has_bottom_parameter(t.a) & has_bottom_paramete
 has_bottom_parameter(t::TypeVar) = t.ub == Bottom || has_bottom_parameter(t.ub)
 has_bottom_parameter(::Any) = false
 
-min_world(m::Core.CodeInstance) = reinterpret(UInt, m.min_world)
-max_world(m::Core.CodeInstance) = reinterpret(UInt, m.max_world)
-min_world(m::Core.CodeInfo) = reinterpret(UInt, m.min_world)
-max_world(m::Core.CodeInfo) = reinterpret(UInt, m.max_world)
+min_world(m::Core.CodeInstance) = m.min_world
+max_world(m::Core.CodeInstance) = m.max_world
+min_world(m::Core.CodeInfo) = m.min_world
+max_world(m::Core.CodeInfo) = m.max_world
 get_world_counter() = ccall(:jl_get_world_counter, UInt, ())
 
 
diff --git a/src/jltypes.c b/src/jltypes.c
index 63d4813df1423..48483f9845a09 100644
--- a/src/jltypes.c
+++ b/src/jltypes.c
@@ -1965,8 +1965,8 @@ void jl_init_types(void) JL_GC_DISABLED
                             jl_type_type, // TupleType
                             jl_any_type, // TupleType
                             jl_any_type, // SimpleVector{TupleType}
-                            jl_long_type, // Int
-                            jl_long_type, // Int
+                            jl_ulong_type, // UInt
+                            jl_ulong_type, // UInt
                             jl_any_type, // Any
                             jl_bool_type,
                             jl_bool_type,
@@ -2099,8 +2099,8 @@ void jl_init_types(void) JL_GC_DISABLED
                             jl_any_type,
                             jl_any_type,
                             jl_any_type,
-                            jl_long_type,
-                            jl_long_type,
+                            jl_ulong_type,
+                            jl_ulong_type,
                             jl_bool_type,
                             jl_bool_type,
                             jl_bool_type,
@@ -2136,8 +2136,8 @@ void jl_init_types(void) JL_GC_DISABLED
                             jl_module_type,
                             jl_symbol_type,
                             jl_int32_type,
-                            jl_long_type,
-                            jl_long_type,
+                            jl_ulong_type,
+                            jl_ulong_type,
                             jl_type_type,
                             jl_any_type, // Union{Array, Nothing}
                             jl_any_type, // TypeMap
@@ -2193,8 +2193,8 @@ void jl_init_types(void) JL_GC_DISABLED
                         jl_svec(11,
                             jl_method_instance_type,
                             jl_any_type,
-                            jl_long_type,
-                            jl_long_type,
+                            jl_ulong_type,
+                            jl_ulong_type,
                             jl_any_type,
                             jl_any_type,
                             jl_any_type,
diff --git a/stdlib/Serialization/src/Serialization.jl b/stdlib/Serialization/src/Serialization.jl
index e45227e03fe36..8336874404d1f 100644
--- a/stdlib/Serialization/src/Serialization.jl
+++ b/stdlib/Serialization/src/Serialization.jl
@@ -1015,8 +1015,8 @@ function deserialize(s::AbstractSerializer, ::Type{CodeInfo})
         ci.slottypes = deserialize(s)
         ci.rettype = deserialize(s)
         ci.parent = deserialize(s)
-        ci.min_world = deserialize(s)
-        ci.max_world = deserialize(s)
+        ci.min_world = reinterpret(UInt, deserialize(s))
+        ci.max_world = reinterpret(UInt, deserialize(s))
     end
     ci.inferred = deserialize(s)
     ci.inlineable = deserialize(s)