This reverts commit f691ebe039. Change-Id: Idc0bb0e4401e2561f2d8e3132f14df14b7537448 Partial-Bug: #1253896
f691ebe039