Breaks shamu for unknown reason. This reverts commit da305061. Bug: 17480683 Change-Id: Id10ff18ef6e3acb5eb84196f7e5608add7edeb66