WP-4490: change field order.