vc-refactoring: revert r2471 in favor of r2525
Authored by: cboos 2005-11-09
Parent: [r2525]
Child: [r2527]