Partially revert 2007-11-10 change.