diff --git a/src/util/loopUnrolling.ml b/src/util/loopUnrolling.ml
index 7fde40aa75..b03133e79e 100644
--- a/src/util/loopUnrolling.ml
+++ b/src/util/loopUnrolling.ml
@@ -343,15 +343,11 @@ let loop_unrolling_factor loopStatement func totalLoops =
         Found -> true
     in
     (*unroll up to near an instruction count, higher if the loop uses malloc/lock/threads *)
-    let targetInstructions = if unrollFunctionCalled then 50 else 25 in
     let loopStats = AutoTune0.collectFactors visitCilStmt loopStatement in
     if loopStats.instructions > 0 then
-      let fixedLoop = fixedLoopSize loopStatement func in
-      (* Unroll at least 10 times if there are only few (17?) loops *)
-      let unroll_min = if totalLoops < 17 && AutoTune0.isActivated "forceLoopUnrollForFewLoops" then 10 else 0 in
-      match fixedLoop with
-      | Some i when i <= 100 -> Logs.debug "fixed loop size"; i
-      | _ -> max unroll_min (targetInstructions / loopStats.instructions)
+      match fixedLoopSize loopStatement func with
+      | Some i when i <= 20 -> Logs.debug "fixed loop size %d" i; i
+      | _ -> 4
     else
       (* Don't unroll empty (= while(1){}) loops*)
       0