WP-3847: Remove field collection patch for validation