Thanks to Paul Franklin for reporting it. (cherry picked from commit fa2be88b6868d87a4b80959666b96b9a7299a200)