Revert "Merge pull request #14199 from Rik/change-reporter-944279"

This reverts commit c8968dcc8704c898857c4a0d2ad23f2ef4526515, reversing
changes made to 222bae6309714d10e007f2f143da9e15a05156ca.