Moving back to 2.5.0