Fix non-special clock trigger tasks.

Looks like f289273b26056718da530d57efc5a7aa175544ca has broken it the
other way round.
Merge pull request #580 from matthewrmshin/fix-special-non-clock-trigger

Fix non-special clock trigger tasks.
Merge remote branch 'upstream/master' into pre-initial-ignore