Revert "Back to 3.3"

This reverts commit 49da840f27d611519499dba1aa01871828e8303b.