Thanks David Nelson Adamec for the report and Tim Graham for the review. Backport of 9324935c from master.