Revert "tweaks to client to fix possible double report and errors in queue"

This reverts commit a22da37a679b5f08458d591d53ad427b2f7143ae.