Merge "Fix the fs_config call."