[BZ 970784] Fix GUE on new deployments

(cherry picked from commit ad6518964860c36d0ccd8a22d33fb6242d6d62a7)