This reverts commit b90ff827. All the breakages are now fixed or mitigated. Bug: 169004486 Change-Id: Ibec4b1f0a50c5ef6769bc6916a81721a4ce03c60 Test: presubmit