Fix the thumbnails issue again

Change-Id: Ib9db664a2e00f62965a90517edd27b5260aeb45f