Revert "SI-7841 More robust unspecialization of names"

This partially reverts commit cff8b569c39fb2ce57157fa6adf4ab9289721033

Let's see if the assertions get tripped up in the test suite.