The flaky buildbots make it hard to detect real issue. This is just a temporary fix until we agree
on a permanent solution.