Revert "Make the affiliation types more forgiving on portal tabs"

This reverts commit 68d72257612f8bc343d6a4b7dc59680c263b0ad1.
Revert "KIM portal mods Step 1"

This reverts commit b8c4980621915cd95b04974580a8c08e632fa23c.