We need this for a follow up security fix. (cherry picked from commit b934ac3d)
mentioned in commit 04eec495
mentioned in commit b07d7820