Apologies,

A typo in the commit of the previous patch propagated into the
email. This is an update to the stable branch *5.2.2*, not
2.2.2. Sorry for the confusion. A corrected patch with the correct
commit message is below.

Best,
Adam