Remove/correct arbitrary classes in reports promises.
(cherry picked from commit efe8e8c384d483ada1f1f70f4445e0ea363b7fae)