This reverts commit bde7bc45af2bb7f9bee8096d45973f25cc00c5db. Change-Id: I1a0bcd1c2e0d4ade7efa980edd2105408bb48991