Should fix #4585. Signed-off-by: Steve Wolter <swolter@google.com> (cherry picked from commit e868da1705)
e868da1705