Temporarily revert "MFV r274272 and diff reduction with upstream."

This reverts commit dac469e5492862b86cad511bcf2236810a011be5.

Ticket: #6689