This reverts commit 5d570c875e. Buildbots are still borken, need more time to investigate.
5d570c875e