5b3e513
Bring back the necessary c_rehash util Resolves: #1803370 (cherry picked from commit 6befc19988cfd0db12ad4febd70872ae27930438)