This reverts commit e86d109176. Bug: 18281970 Bug: 18573576 Change-Id: If1cf236ef7eabd15ffb2a5dd33d25a8acabdd14c
e86d109176