Leave the adopted working directories in place so this CD PR does not retarget two live HCP workspaces. Flattening stays a later change.