i thought upstream fixed this?  CC: @philips