Revert "Merge remote-tracking branch 'upstream/userreports' into Pathways-reports"

This reverts commit 20e9eea617f7a74e629af78a07d1e659b3e25dd5, reversing
changes made to 2b5272516dc010a042b4656499ad3a5ccf4e1b18.