diff --git a/src/build_settings.cpp b/src/build_settings.cpp
index 1852013d5..ffb276d1e 100644
--- a/src/build_settings.cpp
+++ b/src/build_settings.cpp
@@ -1388,8 +1388,10 @@ gb_internal void init_build_context(TargetMetrics *cross_target, Subtarget subta
 
 	bc->optimization_level = gb_clamp(bc->optimization_level, -1, 3);
 
-	// ENFORCE DYNAMIC MAP CALLS
-	// bc->dynamic_map_calls = false;
+	if (bc->metrics.os != TargetOs_windows) {
+		// ENFORCE DYNAMIC MAP CALLS
+		bc->dynamic_map_calls = true;
+	}
 
 	bc->ODIN_VALGRIND_SUPPORT = false;
 	if (build_context.metrics.os != TargetOs_windows) {
diff --git a/src/llvm_backend.cpp b/src/llvm_backend.cpp
index 8f5d8966d..716c50837 100644
--- a/src/llvm_backend.cpp
+++ b/src/llvm_backend.cpp
@@ -506,9 +506,9 @@ gb_internal lbValue lb_map_get_proc_for_type(lbModule *m, Type *type) {
 
 	LLVMSetLinkage(p->value, LLVMInternalLinkage);
 	lb_add_attribute_to_proc(m, p->value, "nounwind");
-	// if (build_context.ODIN_DEBUG) {
+	if (build_context.ODIN_DEBUG) {
 		lb_add_attribute_to_proc(m, p->value, "noinline");
-	// }
+	}
 
 	LLVMValueRef x = LLVMGetParam(p->value, 0);
 	LLVMValueRef y = LLVMGetParam(p->value, 1);