Thanks joebuyer at manycycles.com for the report and Simon Charette for the review. Backport of 04e6542b5 from master.