The second commit is the important one