EXPERIMENTAL branch for trying to poke at fixing the random failures

Do not merge