Completes the fix for #76538: added order for folders.