Revert "Upgrade to 3.5"

This reverts commit d8e4a7b20037bb31104a3ef5e44342fcc41c4f12.