Thanks Jeroen Pulles for the report and Simon Charette for the review. Backport of 5a976b4bec7 from master.