This reverts commit 052f4727. Reason for revert: Looks to have broken master b/171756871 Change-Id: I6b3b7039c3e3b8ac453734281cb8e7c71b65aed3