Revert to check_call