Followup a054a75: don't reintroduce removed template parameters

Deep-extending originalData is asking for trouble, because there's
no way to delete anything that way.

Bug: 73134
Change-Id: I44d3e582e04942efceae3e0bdbbaa147095b5146
Merge "Followup a054a75: don't reintroduce removed template parameters"