Don't throw out as many checks, keep others under an option

This is mostly a revert of the initial commit. See the diff from both
for the intended changes.

Author: tblah