Squash those commits, so I can landed it.