This reverts commit 43b25e4b20. Closes-bug: #1466075 Change-Id: Ib44cf45fb90dca1c8512048d89ceba2b2d47c35b
43b25e4b20