Revert "upd"

This reverts commit a966225aff2ebb025f39e66e4014c4bf866f3907.
Revert "upd"

This reverts commit 5bb8213d477caf27e077e198d896e288de9c6939.
Revert "upd"

This reverts commit d13acc2d17e678143d859b8b9337123068c8cd32.
Revert "Remove unnecessary dependencies between host and target modules."

This reverts commit ad8765b2c9a7fe5e5c2145dd106d88503f14eec6.