Oh, I see now what you mean. However, I don't see any real difference between having the workaround and not having it. I'm testing with current master and cm 6a33096e6021fa5c48abf2867e7b68569168e24a. Could you verify if you're behind any of those?