Submodule linking
Revert "Submodule linking"

This reverts commit c49a955fbc359e434737336f3f5b8bd3c6dc9a34.