Fix path settings now that upstream does what I want.