Revert "ChangeLog: refreshed with latest cherry pick for v4.2.3"

This reverts commit 5e1201ef5775e7b1aec7a11728b77750ceffefdf.
ChangeLog: refreshed with latest cherry pick for v4.1.3