Revert "Merge pull request #12518 from vipulnsward/remove_count_options"

It is needed for activerecord-depecated_finders

This reverts commit dcff027a5242b20c0c90eb062dddb22ccf51aed9, reversing
changes made to 3a2093984ff49d86db1efeff0c7581e788ecfb9f.
Mark the arguments needed by activerecord-deprecated_finders with a TODO