do not requeue on fail unless asked (change to match existing api) and remove unnecessary logging