Revert "v1.6.4"

This reverts commit 74e9ebf442cb575fec8dd5a85f92db217f63b51a.