Revert "Change to version 3"

This reverts commit b9e5044eb7744622c73f7fbf0ceeb98f09db6a1a.
Revert "Revert "Change to version 3""

This reverts commit 2f53485a5e5321e3cba514ce5d763531d4a538f8.
Revert "Revert "Revert "Change to version 3"""

This reverts commit 26a2bf8e2e25a08ab136adb9c1703cc7892919d6.