[Bug 33814] Performance regression in 1.6-rc2