The rename makes it so that we'll have the original name for the more sensible lazy behavior. (cherry picked from commit 6fdae53df54da0c6349ac32789ec67e3a25a5774)