0a92fb9315
This reverts commit ee45689f14.
1.8.x branch break compatibility. This should become a new package instead.