revert 1.x support