Issue #16607: revert inadvertant change to submodule