Adapt nofib submodule to #9586 changes