Sync update: haberman@'s internal changes.