Merge "Revert^2 "Add throtling to crashloop mitigations"" into main