Replace scope that should not have been removed in the first place
Update submodule