Note that this is another patch that conflicts with the jumbo patch. PR: 69191 Submitted by: "Michal F. Hanula" <f@7f000001.org>, Nick Barkas <snb@threerings.net>