5e08e2ceb6
This seems to cause a NPE when generating report.... reverting. This reverts commit 2c0394f078158ef668e75b74f589a7da59ff9e0e.