Thanks guido@20tab.com for the report and Tim Graham for the analyze. Backport of 1718b5256c from master.