Merge pull request #9842 from eleuzi01/issue-39-2-fw

Undo temporary changes in all-helpers.sh