This reverts commit 7aea3ea8 as it breaks the buildbots. I didn't see these failures in the pre-merge checks, looking into it.