Ticket #3315: Refining the logic used to determine when to use original image url as thumbnail url.