Make 1.6.4 functional.