Revert "1.6.4-R04"

This reverts commit 81095ade0a9f864641ccb80a68f1d939a3f5115f.