Change 'nested-dirs' back to 'sanitized' for less noise - TODO rebase