Has this been fixed upstream already?