Revert "Downgrade to v4.0"

This reverts commit 8288dbe86d562d929d03bee6b356ee61f0cbb5f3.