diff --git a/src/llvm_backend.hpp b/src/llvm_backend.hpp
index 3ae4e24b2..fbb577383 100644
--- a/src/llvm_backend.hpp
+++ b/src/llvm_backend.hpp
@@ -451,7 +451,6 @@ void lb_reset_copy_elision_hint(lbProcedure *p, lbCopyElisionHint prev_hint);
 lbValue lb_consume_copy_elision_hint(lbProcedure *p);
 
 
-bool lb_struct_has_padding_prefix(Type *t);
 lbStructFieldRemapping lb_get_struct_remapping(lbModule *m, Type *t);
 LLVMTypeRef lb_type_padding_filler(lbModule *m, i64 padding, i64 padding_align);
 
diff --git a/src/llvm_backend_general.cpp b/src/llvm_backend_general.cpp
index 01699c978..fcdc1d979 100644
--- a/src/llvm_backend_general.cpp
+++ b/src/llvm_backend_general.cpp
@@ -1674,13 +1674,21 @@ LLVMTypeRef lb_type_internal(lbModule *m, Type *type) {
 			type_set_offsets(type);
 			
 			if (type->Struct.is_raw_union) {
-				unsigned field_count = 2;
-				LLVMTypeRef *fields = gb_alloc_array(permanent_allocator(), LLVMTypeRef, field_count);
-				i64 alignment = type_align_of(type);
+				unsigned alignment = cast(unsigned)type_align_of(type);
 				unsigned size_of_union = cast(unsigned)type_size_of(type);
-				fields[0] = lb_alignment_prefix_type_hack(m, gb_min(alignment, 16));
-				fields[1] = LLVMArrayType(lb_type(m, t_u8), size_of_union);
-				return LLVMStructTypeInContext(ctx, fields, field_count, false);
+				GB_ASSERT(size_of_union % alignment == 0);
+				
+				lbStructFieldRemapping field_remapping = {};
+				slice_init(&field_remapping, permanent_allocator(), 1);
+				
+				LLVMTypeRef fields[1] = {};
+				fields[0] = lb_type_padding_filler(m, size_of_union, alignment);
+				field_remapping[0] = 0;
+				
+				LLVMTypeRef struct_type = LLVMStructTypeInContext(ctx, fields, gb_count_of(fields), false);
+				map_set(&m->struct_field_remapping, hash_pointer(struct_type), field_remapping);
+				map_set(&m->struct_field_remapping, hash_pointer(type), field_remapping);
+				return struct_type;
 			}
 			
 			lbStructFieldRemapping field_remapping = {};
@@ -1689,13 +1697,8 @@ LLVMTypeRef lb_type_internal(lbModule *m, Type *type) {
 			m->internal_type_level += 1;
 			defer (m->internal_type_level -= 1);
 
-			auto fields = array_make<LLVMTypeRef>(temporary_allocator(), 0, type->Struct.fields.count*2 + 2);
+			auto fields = array_make<LLVMTypeRef>(temporary_allocator(), 0, type->Struct.fields.count*2 + 1);
 			
-			if (lb_struct_has_padding_prefix(type)) {
-				LLVMTypeRef padding_offset = lb_alignment_prefix_type_hack(m, type->Struct.custom_align);
-				array_add(&fields, padding_offset);
-			}
-
 			i64 padding_offset = 0;
 			for_array(i, type->Struct.fields) {
 				GB_ASSERT(type->Struct.offsets != nullptr);
diff --git a/src/llvm_backend_utility.cpp b/src/llvm_backend_utility.cpp
index 470347e82..8e4e2008a 100644
--- a/src/llvm_backend_utility.cpp
+++ b/src/llvm_backend_utility.cpp
@@ -808,11 +808,6 @@ lbValue lb_address_from_load(lbProcedure *p, lbValue value) {
 }
 
 
-bool lb_struct_has_padding_prefix(Type *t) {
-	Type *bt = base_type(t);
-	GB_ASSERT(bt->kind == Type_Struct);
-	return bt->Struct.custom_align != 0 && bt->Struct.fields.count == 0;
-}
 lbStructFieldRemapping lb_get_struct_remapping(lbModule *m, Type *t) {
 	t = base_type(t);
 	LLVMTypeRef struct_type = lb_type(m, t);