Some 2.6 code was mixed in with previous version.  This is now corrected to be consistent with master.