Rolled back multi-machine because it was clearly breaking everything