Revert "Try to minimize diff."

This reverts commit 564f65e55b438cb1495f517706c5c74c8527833b.