FIX THUMBFAIL (1/2)

This reverts commit 65ff80b30b187b037856ecbfa646b8320accce88.

Change-Id: I9662ccc9ee1ad2b0878ebff169345b06fdfae90d