more submodule hacking
Revert "more submodule hacking"

This reverts commit c677505589115338d43cc12d152f73e48e9c6c43.