This reverts commit a8b48ab7. Original issue has been fixed in follow up CL. Bug: 73555925 Change-Id: Ie0a157a91c3c66df52370adad7b188f59c4749ea