revert commits for two apparently broken submodules