This is done as an alternative to the patch in !1580, as the last version is already patched. See merge request !1582