Also the duplication will become unnecessary when the 2.6 release is made.