This causes a regression for some characters This reverts commit ab40df9e. Bug: 73054061 Change-Id: Icf1f9d2b89b75031aabb47507135e45a21bc5363