Reverting "remove junk modules"
Revert "remove junk modules"

This reverts commit 367a2db5b585b272b5bcf7ce6dd7a452da4b0cb9.