Revert "Back to 1.7.1 for bug fix"

This reverts commit e68dd49d0c21320644de67527d8c898af25ab7c3.