True initial commit to 1.6.4. Stripped of 1.7.X features.