second pass for #773, blocked for now