Revert "Compatibility for Reporting 2.0"

This reverts commit 8cb92ba0b19633af76a321c9da4ad6c1824468b9.