backout mercurial upgrade, deps for APT are wrong