Refactor way thumbs get associted with articles.

Change-Id: I7f01b0785e558147da386cc1d660e7213f842210