This reverts commit 4cb4711b. Dexterity considerations. CCBUG:442544 (cherry picked from commit 366e42d4)