Can this be reported upstream? Would be great if it just worked.