remove submodule, revert pull request #391