revert to 2.4, 2.5 breaks some programs