Revert re-ordering and removal of .DS_Store that occurred in unicode merge.