Nick's changes that git just couldn't deal with