This reverts commit 693ea60e9e. Bug: 19894176 Change-Id: I1514e8c55f541afb0c653afa57cd16034d1b167b
693ea60e9e