Merge "Attempt to fix performance regression since 5164254"