Revisiting the Relationship between Competition and Price Discrimination