Backing out changes to error handling to baseline with master repo.