Revert "Back to 1.7.1 for bug fix"

This reverts commit b368b1162e6a1a2d568de5db9f69ed485bbd75d0.