Revert changes to thumb_handler, leave pointing at itself

Change-Id: Iead9d5588f8cd28c2427084bda21ecfa8e60a2e1