Revert "Fix #1149: Cluster jewel scaling causes rounding issues (#8821)" (#8858)

This reverts commit e5230c5.

Author: Wires77

src/Modules/CalcSetup.lua

@@ -110,17 +110,7 @@ function calcs.buildModListForNode(env, node)
 	if node.type == "Keystone" then
 		modList:AddMod(node.keystoneMod)
 	else
-		-- Apply effect scaling
-		local scale = calcLib.mod(node.modList, nil, "PassiveSkillEffect")
-		if scale ~= 1 then
-			local combinedList = new("ModList")
-			for _, mod in ipairs(node.modList) do
-				combinedList:MergeMod(mod)
-			end
-			modList:ScaleAddList(combinedList, scale)
-		else
-			modList:AddList(node.modList)
-		end
+		modList:AddList(node.modList)
 	end
 
 	-- Run first pass radius jewels
@@ -134,6 +124,14 @@ function calcs.buildModListForNode(env, node)
 		wipeTable(modList)
 	end
 
+	-- Apply effect scaling
+	local scale = calcLib.mod(modList, nil, "PassiveSkillEffect")
+	if scale ~= 1 then
+		local scaledList = new("ModList")
+		scaledList:ScaleAddList(modList, scale)
+		modList = scaledList
+	end
+
 	-- Run second pass radius jewels
 	for _, rad in pairs(env.radiusJewelList) do
 		if rad.nodes[node.id] and rad.nodes[node.id].type ~= "Mastery" and (rad.type == "Threshold" or (rad.type == "Self" and env.allocNodes[node.id]) or (rad.type == "SelfUnalloc" and not env.allocNodes[node.id])) then