Got a couple reports of lots of missing contacts and we're failing some buildbot tests. 22851 seems like the likely culprit, since it didn't get merged to branch and branch is working fine.