Cherry-pick tangent-by-endpoints