Revert "Merge branch 'master' of github.com:typhoon-framework/Typhoon"

This reverts commit 4dd0244a03b29126756e88d76d4a2aa4719a2781, reversing
changes made to 97d042ab2ac3a5f646ed460f59c3cd6fad104ae4.