This needs to be backported once it is master for the 2.2.1 release.
fixed in 73454473d7c286c41ee697f74052fed03c79f9f5