Revert to 3.6