simplify to reflect fixes in upstream