Switching text to not be unique.
Merging upstream master dedups.