Revert resend promise changes and nits fixing