Revert "git freaked"

This reverts commit 6c650ad50172c268b3b337a55f6202523e492ad8, reversing
changes made to 0a197dc37057a2a504ec68052ea603862178e105.