MFC r323859: Simplify the code by _not_ expecting success under 'fail'.
Submitted by: pjd@ and oshogbo@ MFC after: 1 month Sponsored by: Wheel Systems