Reverted 741cdba to fix startup errors
Official release of 2.5.2.2