Revert "Merge branch 'master' into autocron"

This reverts commit b003cb64d24412642112fa3e8ad0c87fb4e3c457, reversing
changes made to da21f2deff5d1dd4675031c99b80886f706f0434.