Revert previous changes.  Changes have been moved to branches.