Closes https://gitlab.cern.ch/cp3-cms/bamboo/issues/57 (regression of https://gitlab.cern.ch/cp3-cms/bamboo/merge_requests/80)