Revert "Switch to submodule"

This reverts commit 43569ecdb259c3bd2037d69b3b25be79421e0b20.