Revert "Toucan 3.10"

This reverts commit 013bd8bc9b2482ca6822fb2f99eb7863bbc50842.