Revert "Create first merge point for Git"

This reverts commit 01af50eb2ab718a030642ad458d07b45ca890e49, reversing
changes made to b3cb84d8d010c419ef206c724b8ba0100776eb92.

The reverted commit had the effect of backing out several previously committed fixes. Possibly operator error?