This reverts commit 06fcc34ac00e08791d24e1359583f6407096c22e.

Change-Id: I0a150be90d9ee4318d58d7fbe6065f4151d24b30