Revert "Merge pull request #353 from thansmann/cf-jobs-haproxy-fix"

This reverts commit 605c3f35128808e8d9c7c18ef8c827601fbea25f, reversing
changes made to 98356a845c97678a8faeb32c9c46c7127440ba30.