revert thumb-related changes in master