Reverts r2622 and fixes diff unit test.
Authored by: jplang 2009-03-24
Parent: [r2623]
Child: [r2625]