Revert delay to use yield