Get rid of redefinition of RETURN_IF_FAILED