Thanks Víðir Valberg Guðmundsson for the report and Tim Graham for the review. Backport of 460ec09d from master.