- rolled out last two changes, they seem to cause a performance regression