Roll back to 3.1.3