WP-2070: remove inline fields.