Undo some build path changes I made back in November that broke the Janeway build. This fixes that. Marvin build does not work.