Revert "Back to 1.7.1 for bug fix"

This reverts commit 6e076aba3025bcaca4a6370f0730e22fceab64a8.