Revert "Back to 1.7.1 for bug fix"

This reverts commit 05537c5d2af14d9c852b7ec3d18f60881a15c0a3.