I've reverted the patch as we have a confirmed regression, we'll need to find a better way to solve this bug.
I've reverted the patch as we have a confirmed regression, we'll need to find a better way to solve this bug.