Too much was reverted to get rid of the old reporting module.

Partially Revert "Do not exclude reporting, there is no more "ana"."

This partially reverts commit 58bf5f1899ed9a9a759c2218e20cae9aab718efb.

Ticket:	#4014