Revert to 2.5 to hopefully fix overscroll issues