Revert "build: fix for sourcing target image config a when target is being replaced"