I think this is same as the other PR. Just look at my comments there, and I'll close the other one.