This reverts commit ee45689f. 1.8.x branch break compatibility. This should become a new package instead.