Affiliation overflow doesn't work

Backing out that change. It's more complicated than it looks.