This reverts commit 3c097aa4. Reason for revert: we thought this CL caused b/119659731 but apparently it is not. Change-Id: Id375c4c8f2bffb7c42dc36bc053d536c6ea57a8d