Redo THUMB support.

Discussed with and tested by: Saleem Abdulrasool