Reinstate DefaultFailType preference

Hopefully this will clean up the default fail type related problems we've seen.