Revert 2008-03-21 changes.