This reverts commit 18a1827a. Bug: 21333911 (cherry picked from commit 0fc16a09) Change-Id: I8cb96efbf7151b238f3ee137a938b20ddfaf0ebc