Make this whole thing buildable again.