re-added two submodules. Grrr.