Go back to 3.6.1