Revert "Rebundle contacts"

This reverts commit 92e8ae23a7d7acb8e721ba7813eef121104e842f.

Change-Id: Id51667ad76769d1e219ef2e557f43f473037f4b9
1 file changed