This reverts commit 921a411b. Reason for revert: reland Fixes: 179498407 Change-Id: Id1726a5d8ff845bde7423a4194f3d7e7548a466d