Revert "Update to 3.1.1"

This reverts commit 1c8e631beb0f48497b6b652f25bed6713b43ffbb.