The fix has not been merged because it had issues. Better the fix that we'd take is much more complex then the one we have.