Upstream fix pushed in 5da4cbfbd94163f87f188355e5490f04dd6864c2.