This reverts commit 3c0cb60f.

This went in too early; it belongs with a patch set that handles
builds from both git and svn.