Revert "Minor adjustments map-jobs"

This reverts commit 97d3c22eeebec6e40f9223877008f0139dc2251e.