This reverts commit 0dad0592. Change-Id: I2b7d842f88f89a980f68c8f50556a3f01d468402 (cherry picked from commit d31a7814)