reverting changes to see if performance hit is corrected