This reverts commit 4b0a134b. The mentionned PR break scale.yml. This goes back to the status quo until a proper fix can be provided, at which point we'll reapply the PR.