1d7b1ee
core/unit: drop dependency to the unit being merged Fixes a bug in 15ed3c3a188cf7fa5a60ae508fc7a3ed048d2220. Fixes #24990. Also, hopefully fixes #24577. (cherry picked from commit c8b3b524134539846917269ddd644ee93a35623f)