diff --git a/configure/E3/RULES_E3 b/configure/E3/RULES_E3
index 82dda913018ff81daa51db99c748c44f9287f3cb..1557dc26a0283143667abf370906f7a021934650 100644
--- a/configure/E3/RULES_E3
+++ b/configure/E3/RULES_E3
@@ -39,7 +39,7 @@ err_no_db_rule:
 	$(error The 'db' target has been discontinued. If you have custom database expansion rule to use, please contact the e3 team)
 
 .PHONY: install_module
-install_module: build db_internal
+install_module: build
 	$(QUIET) $(E3_MODULE_MAKE_CMDS) install
 
 .PHONY: check_uninstall
@@ -50,7 +50,7 @@ uninstall: check_uninstall conf
 	$(QUIET) $(E3_MODULE_MAKE_CMDS) uninstall
 
 ## Build current module
-build: conf checkout prebuild
+build: conf checkout prebuild db_internal
 	$(QUIET) $(E3_MODULE_MAKE_CMDS) build
 
 ## Run module-specific commands before building
diff --git a/require.Makefile b/require.Makefile
index 3cf2f10ef35a57b69806b1dd9b9abb269afcf0ff..d07f41179c72fb1fabedb9c6c5ce7d1e1adb0f09 100644
--- a/require.Makefile
+++ b/require.Makefile
@@ -85,20 +85,7 @@ dbLoadTemplate.c: dbLoadTemplate_lex.c ../$(APPSRC)/dbLoadTemplate.h
 # So, ESS uses it internally independent upon any IOC
 # variables
 #
-EPICS_BASE_HOST_BIN = $(EPICS_BASE)/bin/$(EPICS_HOST_ARCH)
-MSI =  $(EPICS_BASE_HOST_BIN)/msi
-
 USR_DBFLAGS += -I . -I ..
 USR_DBFLAGS += -I$(EPICS_BASE)/db
 
 TMPS = $(wildcard $(APPDB)/*.template)
-
-.PHONY: db
-db: $(TMPS)
-
-.PHONY: $(TMPS)
-$(TMPS):
-	@printf "Inflating database ... %44s >>> %40s \n" "$@" "$(basename $(@)).db"
-	@rm -f  $(basename $(@)).db.d  $(basename $(@)).db
-	@$(MSI) -D $(USR_DBFLAGS) -o $(basename $(@)).db $@  > $(basename $(@)).db.d
-	@$(MSI)    $(USR_DBFLAGS) -o $(basename $(@)).db $@