Revert "Point to forked submodules"

This reverts commit 906411352cac0946c2aa902eacf323224b78a158.