0025424: Performance regression on step import