Follow-up to 72d6d0c2704ee6d9 updating submodules for real