This reverts commit 194e004e81. Bug: 10786040 Change-Id: I4c5287d46cabe287abce5cba77635cf26d2cd192
194e004e81