Back to 2.5.0.Snapshot

This reverts commit 42aba93be684e4b3e93266099f6ffb1595749b8a.