Going back to one build.

Would love to have builds split as Enrico was suggesting, but can't get it to work right now.