What exactly was changed here? Maybe there's a better way to abstract it so it can be a smaller diff?