diff --git a/rel.admin.inc b/rel.admin.inc
index d54e324..7503f85 100644
--- a/rel.admin.inc
+++ b/rel.admin.inc
@@ -362,11 +362,11 @@ function rel_build_unregister_form_submit($form, &$form_state) {
     ->execute();
 
   // Cleanup field bundle settings.
-  $field_bundle_settings = variable_get('field_bundle_settings', array());
-  if (isset($field_bundle_settings[$build->entity_type][$build->bundle]['extra_fields'][$build->context])) {
-    unset($field_bundle_settings[$build->entity_type][$build->bundle]['extra_fields'][$build->context]);
+  $field_bundle_settings = field_bundle_settings($build->entity_type, $build->bundle);
+  if (isset($field_bundle_settings['extra_fields'][$build->context])) {
+    unset($field_bundle_settings['extra_fields'][$build->context]);
+    field_bundle_settings($build->entity_type, $build->bundle, $field_bundle_settings);
   }
-  variable_set('field_bundle_settings', $field_bundle_settings);
 
   // Let other modules act on the unregistration of the build.
   module_invoke_all('rel_build_unregister', $build);