Add patch to make work on new CircleCI VMs