Restore text wrapping (#16776)