Restore 1.6 compatibility
Prep 1.2.5.Final
Next is 1.2.6.Final