Swap config block order (merely for consistency with installer code)