Unfortunatly not all buildbots are updated. This reverts commit ffb807ab.
mentioned in commit 65429b9a