As the bug title says. I think there's other bits of duplication here and there too, this needs a general going-over.
<rdar://problem/84200006>