Downgrade back to 2.4.x