Actually port ecfe9bf0117b to default
(I had the wrong impression that the problem didn't exist here)
A
Antoine Pitrou committed
d3b2aefbfe69df40dc2f0adf31a188fbbdcc5923
Parent: a40762f
(I had the wrong impression that the problem didn't exist here)