+1 to normalizing this, if it is possible.  The library has never had 2.5 in its support matrix, so we should be AOK moving in this direction.