This reverts commit 08d224e955. Causes bugs in Vector when displaying the badges. Bug: T162173 Change-Id: I9e92c304b47ce9204d7a7d2fba67118e67b1bdc9
08d224e955
eed48aa7