Thanks Luke Plant for the report, and Tim Graham, Simon Charette, and Markus Holtermann for review and discussion. This is a backport of d4bdddeefe35214f194cb85e40dbb761c206e7fa from master.