Revert "Back to 1.7.1 for bug fix"

This reverts commit 944ccda96efebb592be113ec560ff47f729ee631.