This fixes #7887.  It now sets ContactFail correctly.