Oh joy! Git gymnastics early in the morning... WTF