This fixes #8138.  It should now not duplicate stuff.