I don't understand why git was so bad at figuring out what changed here...