Reverting busted merge in tasks.py