This is done as an alternative to the patch in !1580 (closed), as the last version is already patched.