Revert "MT#6751 force more intrusive check"

This reverts commit ca927c408d1f391088fa72daf14e55f616bf8319.