Bug 18316: Fix field weight validation/deletion bug