Need to clear those primary key index references as well.  I don't know
why this wasn't an issue with testing for 2.0 as well.