Revert to 3.1