Merge "Revert more integrity check changes."