Revert "Merge branch 'master' into quvi-0.9"

This reverts commit d88c8a8ca9bed77ff7885d04ad1c274863ec85f4, reversing
changes made to 6c444a6458d0656394ce370257395a2665de8a49.

I suspect that I partially broke ytsm-cronjob in the recent cleanup.
Reverted until I can figure out what went wrong.