Merge "Removing the Folders tab."