Revert default deep qualification

There wasn't a deprecation warning added for this, and I think it
is too likely to break existing applications.  Deep qualification
is only needed in few cases, and those can use an explicit option
to enable it.