Revert "Submodule is a pain"

This reverts commit 342c85c4b007dd3c7a293eeab4f1a7bed878b5b4.