Revert "Revert "Merge pull request #1585 from dimagi/monthly-after""

This reverts commit 6ae48f12a0041d8b619e577cb01aa3fd75397a50.