1.6.4 v2
Revert "1.6.4 v2"

This reverts commit b63c213cf756996f53caa5f92883375b7162abce.