This reverts commit 814a59ba82 because it broke the build by duplicating code that was already there.
Change-Id: I1e32fd9e70629e5725e503ca372fb20c0aa0035d
This reverts commit 814a59ba82 because it broke the build by duplicating code that was already there.
Change-Id: I1e32fd9e70629e5725e503ca372fb20c0aa0035d