Me too; will make that change to existing 2.6 branch