Merge "Remove obsolete subdirs entry."