Fixed the task imports and worked around the eager task removal.