Fix thumbnail issue introduced in pull #937

Fix thumbnail issue introduced in pull #937  The first block of code removed in that change is still needed.  

Tested on fresh default in install as of changeset 464ecd7