Revert "Back to 1.7.1 for bug fix Also, fix API churn again..."

This reverts commit aa54d4bb2416489cb64502e0590d8f57e71e76f7.
Fix more API churn