revert changes related to count parameter