repeatability cleanup, #37340