re-remove incorrect count
Merge branch 'master' into ubuntu