This is getting ridiculous... WTF is wrong with these thumbs?!

This reverts commit 874433584247f2a6a0364fe2605cf2f2eb0763ae.

Change-Id: I0458442cdb4cd5d5e9497ec70a6d8863c751e15c