2.5.2
Revert "2.5.1"

This reverts commit 7347d7cdf6cc990b6401d9ee62543b47218e9380.