This reverts commit 40f8b9251831c5f009fd476b1a3d216e126d3ef0. Change-Id: I23e8b6ac97d8853c271429fc13fbfa313717a95a