intermittent commit #98239