It seems like it gets cleared at times. Restore it if that's the case. (cherry picked from commit 6f52109e)