Revert "Performance increase in thumbnail handling"

This reverts commit 2b3824de0d3f6645e4f45c6193560e03cdb3fbed.