Revert "Merge pull request #1530 from elzj/issue_2495_move_marked_for_later"

This reverts commit 1eb9c54245a5c12fa35bffaba18cbd13f636fc09, reversing
changes made to 02e2b33ae5382b025e99c960cbb6d0f128b64ece.