This reverts commit 119e24f987. Bug: 12163013 Change-Id: I574d1492253eb6e1f570411e441c5bea7376112c
119e24f987