Revert "Update to 3.1.1"

This reverts commit c4790dff7b110a9a1050c60d62aa8f2130dda1ed.