Again, this wasn't a change from this pull request, but I think this should come from the model.