Revert "get rid of count(*) overrides query"

This reverts commit b5c63024e0790cb3e8ef793d342bfe0411b734dd.

fixes CNVS-14018

test plan:
- specs should pass

Change-Id: I021598d81fb9462d6470e3b3a038e96b3d8060b4
Reviewed-on: https://gerrit.instructure.com/37366
Reviewed-by: Bryan Madsen <bryan@instructure.com>
Product-Review: Bryan Madsen <bryan@instructure.com>
QA-Review: Bryan Madsen <bryan@instructure.com>
Tested-by: Bryan Madsen <bryan@instructure.com>