Attempt at moving to a more git-based checkout world