Make the old filesystem layout the default for now, refs #874