Revert clobbering of earlier bg_form changes