Rollback changes made in 30cfe1965c15ac12547ac061cc7515679ddb677c that cause an issue with the task