Reverted 43095307da327e82f136c5fe17d4fdecb3f78cb6.

The proposed fix broke for multiple displays of the same model.