Apply fix to clean submodules from Niklas Angare.