Revert "Pass count_models through"

This reverts commit 506b488588e8b48e532833e5bff34bbfa672d82f.