Make directory choice explicit to fix build broken by change in default