More attempts to fix build flakes.