Merge pull request #9835 from eleuzi01/issue-39-2-backport

[Backport 3.6] Undo temporary changes in all-helpers.sh