intermittent commit #98238