The new salt-cloud works out of the box; remove local patches.