New upstream bim.  Appears to work.