Revert "Back to 1.7.1 for bug fix"

This reverts commit fb8301206bb0de3b8fbf8f32d10526de45166866.