follow up to r106094