this mostly undoes changeset http://svn.planet-lab.org/changeset/6958