2.5.0-dev
Revert "2.5.0-dev"

This reverts commit cfcd41aaed3003a30e5ed93cace108340e36425b.