Merge "Remove bogus DCHECK." into nyc-dev