Revert "Ignore last_task for now. Horrible hack."

This reverts commit 46e8fec5d5791a335633fb252e4604e7ce432653.
Merge remote-tracking branch 'upstream/master'