This is a backport of core#24956
Depends on D13097
ninja all check-all
cleanup to match the backport
remove unnecessary double cast, GetDifficulty already returns a double