redo http://svn.planet-lab.org/changeset/13771 from scratch