Bug 4263: Fix subfield ordering broken by earlier patch