This reverts commit abde98cda2. Temporarily dropping from master, since this actually uses stuff that's only currently availble in the assistant branch. Will come back when I merge that, and can wait..
abde98cda2