hg strip to 317fe0f314ab; fix both sha divergence and <h<surkov?.