This reverts commit 4048ddf7. 2.5.0 is a development series and the upgrade should have been to 2.4.x.