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