Revert "Added more changes on public collection count"

This reverts commit 611d5a5e6f6fe1609c8ba03590a38a8222b9962a.