Improve solution for #3880: don't prevent associating the same model again, it's causing problems in ModelSelector.