Reverted optimize task changes