WP-4562: Remove panopoly items.
WP-4490: change field order.