Revert "from svn"

This reverts commit 3bed71e4ff2abf75de00101a2695d867b78514a6.