Update back to 1.6.4