This reverts commit 07bc29c494. probably 3.12 works fine, but for technical reasons the automated tests don't work yet. hoping once we drop 3.6 support then can get the 3.12 tests working properly..
07bc29c494