Revert broken merge
substitute: Strip away action magic.
Merge remote-tracking branch 'upstream/master'
New module twitch