Merge "Revert "Introduce a NearLabel in thumb2.""