Revert "Added handlers to only count the number of records"

This reverts commit d1faa4a8d8c6fc1fa587a25b97ae377076b7acd2.