This reverts commit 17774bc4 There is still a known culprit (duplicate display names) so the hack shouldn't be reverted. CCBUG: 353975 CCBUG: 438114 (cherry picked from commit 9c7ac706)