Final fix. Hopefully git works as expected.