Sync up code broken by recent JOST-28 fix.